More alerts fixes and Bro formatting change