Added alerts fixes