LIB001-902: Fixes for accessibility