Fix zk/broker issues