More p2p fixes