osx build fixups