Polish the health check a bit.