more *nix compatibility fixes