[FOLD] BindHandler fix
[FOLD] PeerFinder fixes