Healthchecker fixes (WIP)