OSX build fix attempt!