More osx build fixes
Fix last commit