Add fixes for iOS7