Fixing p2p issues