More support for health check / lameduck mode.