Fixed some p2p issues@