iOS 8 and Xcode 6 fixes