Fixups for OSX