More fixes for iOS 7