Fixes for iOS 8