Some accessibility related changes.