More alerts fixes