Small fixes needed for Zyre gossip work