Fixes to fixedPeer logic