Some changes to get gossip to work well