Additional fixes for iOS 8