Various tweaks, some for accessibility.