Gossip fixes after testing