fixups for osx