More gossip bug fixes