Bug fixes for hilite