OSX patch tweaks.