More OSX workarounds.