Minor format changes on P2P