Event alert fixes