fixups for building on OS X where apple define silly macros