Fixing a couple of accessibility issues