Fire logic fixes