Start fixing up build on OS X.