[FOLD] PeerFinder fixes