Fixes for iPhone issue