Osx fixes