osx support fixes