Fixes for *nix