fixes for iOS 8