Peer counter improvements