More highlighting fixes