Alerts fixed