Part of fixes for iPhone new deal