P2PService fixes;