Other changes to make osx work