osx build unfixes