Merge "Build: Fix OSX build issues."