Updated with the latest fixes for iOS 8