Accessibility improvements

This is just the stuff of the requests #415 and #416 for the case of
releases from this branch.