Hopefully fix some OSX build issues.