Some fixes for alerts and health check components