Another OSX build fix attempt!