P2P Helper Bug Fixes
P2P Helper Bug Fixes