More corrections for highlight zones #275