Fix order
Update for newer client
Update for newer zk client