Cleanup for iOS 6, etc.