More tweaking to osx