More alerts changes