More zookeeper changes.