Fix some overlaps.