Peers fixes