Fix for --enable-zookeeper option