Minor fixes to gossip