Some Xcode 6 beta 7 fixes.