fixes for iOS6