Updates to make the project compatible with Bro 2.2