Better *nix support