[FOLD] Peer fixes