Fixing issues with iOS 8.