More tweaks for *nix compatibility.