Peer pool improvements and fixes