A few fixes to marathon and mesos checks