P2P Fixes and Updates