minor fixes for 'highlight'