Fixes to PeerIdentifier and peer listing