Updates for 2.2 alert bug