Changes for *nix compatibility