[FOLD] Peer, PeerFinder fixes