Fixes for iOS 7