Xcode 6 Beta 7 fixes