Highlighting fixes