Fixes for iOS 6