Further tweaks as requested by iOS team