Zookeeper fixes