Small fixes for iOS 6