Fix accessibility

Detailed description of changes is in the commit messages