Added a few fixes for iOS7.