Cleaned up some of the alerts