Merge "p2p fixes"