Merge "Fix alerts"