add fixes to osx