Highlighter and Completer Fixes