am b0b74c3e: Fix some accessibility issues

* commit 'b0b74c3e3e5eac1d8aa9132ca59bcf2a9cafe691':
  Fix some accessibility issues