Few fixes for iOS 7.1.1 support