fix up concurrent p2p support