WIP making osx functions match the *nix ones