Overlap fixes (intro)