fixes for latest osx