Highlighter fixes