more overlap fixes