Bugfixes for the build on new OSX machines (XCode 5.0 on).