More fixes to combustion events