More fixes for iOS6