Minor modifications for iOS 7.1