Fix a few things for iOS 7