Correct several accessibility warnings