Fix highlighting issues