alert_hub fixes