Commit fixes for Mac OS X build.