Overlap fixes