Minor accessibility changes.
Minor changes