Changes needed for Xcode 6 beta 7.