Minor highlighting fixes