More fixing of OSX build process