Made things compile after importing changes from firefighter