Fix overlap checks