Further overlapping elements fixes