fixes for iOS 6