Add a couple of Apple OSX workarounds.