Fixups for MacOSX building