Small highlighter fixes