diff --git a/prototypes/updates/base-updates.lua b/prototypes/updates/base-updates.lua
index 307e000c..4984cb64 100644
--- a/prototypes/updates/base-updates.lua
+++ b/prototypes/updates/base-updates.lua
@@ -160,13 +160,13 @@ RECIPE("rail"):clear_ingredients():add_ingredient {type = "item", name = "stone"
 RECIPE("landfill"):replace_ingredient("stone", {type = "item", name = "stone", amount = 30}):add_ingredient {type = "item", name = "gravel", amount = 30}:add_ingredient {type = "item", name = "soil", amount = 30}
 RECIPE("burner-inserter"):replace_ingredient("iron-plate", {type = "item", name = "iron-plate", amount = 5})
 RECIPE("burner-inserter"):replace_ingredient("iron-gear-wheel", {type = "item", name = "iron-gear-wheel", amount = 2})
-ITEM("rocket-fuel"):set_fields {fuel_categories = {"jerry"}}
+ITEM("rocket-fuel").fuel_categories = {"jerry"}
 
 data.raw.item["wood"].fuel_categories = {"biomass"}
 data.raw.item["nuclear-fuel"].burnt_result = nil
 -- add ash to burnt results for chemical fuel items
-for i, item in pairs(data.raw.item) do
-    if item.fuel_categories and table.any(item.fuel_categories, function(f) return f == "chemical" end) and item.name ~= "active-carbon" then
+for _, item in pairs(data.raw.item) do
+    if ITEM(item.name):has_fuel_category("chemical") and item.name ~= "active-carbon" then
         data.raw.item[item.name].burnt_result = "ash"
     end
 end
diff --git a/prototypes/updates/entity-updates.lua b/prototypes/updates/entity-updates.lua
index 5b07195d..1e26c5f8 100644
--- a/prototypes/updates/entity-updates.lua
+++ b/prototypes/updates/entity-updates.lua
@@ -96,11 +96,9 @@ data.raw["mining-drill"]["electric-mining-drill"].mining_speed = 2
 data.raw["mining-drill"]["electric-mining-drill"].energy_usage = "1MW"
 
 data.raw.furnace["stone-furnace"].energy_usage = "200kW"
-data.raw.furnace["stone-furnace"].energy_source.fuel_category = nil
 data.raw.furnace["stone-furnace"].energy_source.fuel_categories = {"chemical", "biomass"}
 
 data.raw.furnace["steel-furnace"].energy_usage = "500kW"
-data.raw.furnace["steel-furnace"].energy_source.fuel_category = nil
 data.raw.furnace["steel-furnace"].energy_source.fuel_categories = {"chemical", "biomass"}
 
 RECIPE("steel-furnace"):replace_ingredient("stone-brick", "refined-concrete")
@@ -108,13 +106,11 @@ RECIPE("steel-furnace"):replace_ingredient("stone-brick", "refined-concrete")
 
 data.raw.inserter["burner-inserter"].energy_source = {type = "void"}
 data.raw.inserter["burner-inserter"].next_upgrade = "inserter"
---data.raw.inserter['burner-inserter'].energy_source.fuel_category = nil
 --data.raw.inserter['burner-inserter'].energy_source.fuel_categories = {'chemical', 'biomass'}
 
 data.raw.inserter["inserter"].extension_speed = 0.035
 data.raw.inserter["inserter"].rotation_speed = 0.02
 
-data.raw["mining-drill"]["burner-mining-drill"].energy_source.fuel_category = nil
 data.raw["mining-drill"]["burner-mining-drill"].energy_source.fuel_categories = {"chemical", "biomass"}
 
 data.raw.furnace["electric-furnace"].energy_usage = "1MW"
@@ -130,13 +126,10 @@ if mods["Companion_Drones"] then
     data.raw["spider-vehicle"]["companion"].energy_source.burnt_inventory_size = 1
 end
 
-data.raw.car.car.energy_source.fuel_category = nil
 data.raw.car.car.energy_source.fuel_categories = {"jerry", "chemical", "biomass"}
 data.raw.car.car.energy_source.burnt_inventory_size = data.raw.car.car.energy_source.fuel_inventory_size
-data.raw.car.tank.energy_source.fuel_category = nil
 data.raw.car.tank.energy_source.fuel_categories = {"jerry", "chemical", "biomass"}
 data.raw.car.tank.energy_source.burnt_inventory_size = data.raw.car.tank.energy_source.fuel_inventory_size
-data.raw.locomotive.locomotive.energy_source.fuel_category = nil
 data.raw.locomotive.locomotive.energy_source.fuel_categories = {"chemical", "biomass"}
 data.raw.locomotive.locomotive.energy_source.burnt_inventory_size = data.raw.locomotive.locomotive.energy_source.fuel_inventory_size
 data.raw.locomotive.locomotive.max_speed = nil