fix accessibility issues. #3442