Minor fixes to Mesos and Zookeeper