Some OSX build fixes.