alert fixes