fixes for iOS 5.x