Update for iOS 8 support