Fixed some more issues with the firefighting code.