fixes for better *nix compat