Update for iOS 8 and XCode 6