Some optimization and accessibility fixes.