more changes from osx