MS-541: small mods to accessibility