More highlighting tweaks