Fix health-checks