healthcheck fixes