Added a few more accessibility fixes.