More tweaks to support VoiceOver