Fixes for iOS7