More changes for zgossip and other improvements