alerts fixes