diff --git a/Tantalite2/prototypes/tantalum-recipe.lua b/Tantalite2/prototypes/tantalum-recipe.lua
index 1d58ea4..c5af548 100644
--- a/Tantalite2/prototypes/tantalum-recipe.lua
+++ b/Tantalite2/prototypes/tantalum-recipe.lua
@@ -57,12 +57,14 @@ data:extend({
     }
   })
 
+  local glass_name = mods["Krastorio2"] and "kr-glass" or "glass"
+
   local electron_gun_ingredients = {{type="item", name="tantalum-plate", amount=1}, {type="item", name="thoriated-filament", amount=1}, {type="item", name="electronic-circuit", amount=2}}
   if mods["bismuth"] then
     table.insert(electron_gun_ingredients, {type="item", name="pcb-solder", amount=2})
   end
-  if data.raw.item["glass"] then
-    table.insert(electron_gun_ingredients, {type="item", name="glass", amount=2})
+  if data.raw.item[glass_name] then
+    table.insert(electron_gun_ingredients, {type="item", name=glass_name, amount=2})
   end
   if mods["LasingAround-Updated"] then
     electron_gun_ingredients = {{type="item", name="tantalum-plate", amount=1}, {type="item", name="thoriated-filament", amount=1}, {type="item", name="electronic-circuit", amount=2}, {type="item", name="empty-amplifier-tube", amount=1}}
@@ -98,29 +100,20 @@ data:extend({
   })
 
   local crt_ingredients = {{type="item", name="electron-gun", amount=1}, {type="item", name="coal", amount=1}, {type="item", name="advanced-circuit", amount=3}}
-  if data.raw.item["glass"] then
-    table.insert(crt_ingredients, {type="item", name="glass", amount=3})
-  end
-  if data.raw.item["kr-glass"] then
-    table.insert(crt_ingredients, {type="item", name="kr-glass", amount=3})
+  if data.raw.item[glass_name] then
+    table.insert(crt_ingredients, {type="item", name=glass_name, amount=3})
   end
   local crt_subgroup = "intermediate-product"
   if mods["bzcarbon"] then
     crt_ingredients = {{type="item", name="electron-gun", amount=1}, {type="item", name="graphene", amount=1}, {type="item", name="advanced-circuit", amount=3}}
-    if data.raw.item["glass"] then
-      table.insert(crt_ingredients, {type="item", name="glass", amount=3})
-    end
-    if data.raw.item["kr-glass"] then
-      table.insert(crt_ingredients, {type="item", name="kr-glass", amount=3})
+    if data.raw.item[glass_name] then
+      table.insert(crt_ingredients, {type="item", name=glass_name, amount=3})
     end
   end
   if mods["bzcarbon"] and mods["bismuth"] and mods["bzaluminum"] then
     crt_ingredients = {{type="item", name="electron-gun", amount=1}, {type="item", name="graphene", amount=1}, {type="item", name="advanced-circuit", amount=3}, {type="item", name="pcb-solder", amount=3}, {type="item", name="aluminum-plate", amount=5}}
-    if data.raw.item["glass"] then
-      table.insert(crt_ingredients, {type="item", name="glass", amount=3})
-    end
-    if data.raw.item["kr-glass"] then
-      table.insert(crt_ingredients, {type="item", name="kr-glass", amount=3})
+    if data.raw.item[glass_name] then
+      table.insert(crt_ingredients, {type="item", name=glass_name, amount=3})
     end
   end
   if mods["space-exploration"] then
diff --git a/Tantalite2/recipe-final-fix.lua b/Tantalite2/recipe-final-fix.lua
index c2689ba..7d2ae00 100644
--- a/Tantalite2/recipe-final-fix.lua
+++ b/Tantalite2/recipe-final-fix.lua
@@ -1,6 +1,6 @@
 local util = require("data-util")
 
-util.remove_ingredient("rocket-control-unit", "glass")
+util.remove_ingredient("rocket-control-unit", mods["Krastorio2"] and "kr-glass" or "glass")
 util.remove_ingredient("rocket-control-unit", "advanced-circuit")
 util.add_ingredient("rocket-control-unit", "advanced-circuit", 2)
 
diff --git a/Tantalite2/recipe-modify.lua b/Tantalite2/recipe-modify.lua
index 294b311..9ba7638 100644
--- a/Tantalite2/recipe-modify.lua
+++ b/Tantalite2/recipe-modify.lua
@@ -2,10 +2,10 @@ local util = require("data-util")
 
 -- Main vanilla changes
 util.replace_ingredient("laser-turret", "electronic-circuit", "electron-gun", 5)
-util.remove_ingredient("laser-turret", "glass")
+util.remove_ingredient("laser-turret", mods["Krastorio2"] and "kr-glass" or "glass")
 
 util.add_ingredient("rocket-control-unit", "crt", 1)
-util.remove_ingredient("rocket-control-unit", "glass")
+util.remove_ingredient("rocket-control-unit", mods["Krastorio2"] and "kr-glass" or "glass")
 
 util.replace_ingredient("heat-exchanger", "copper-plate", "tantalum-plate",50)
 util.replace_ingredient("heat-pipe", "copper-plate", "tantalum-plate",20)
@@ -115,7 +115,7 @@ if mods["Krastorio2"] then
 end
 
 if mods["space-exploration"] then
-    util.add_product(mods["space-exploration"] and "se-scrap-recycling", {name="tantalite-ore", amount=1, probability=0.05})
+    util.add_product(mods["space-exploration"] and "se-scrap-recycling", { type = "item", name = "tantalite-ore", amount=1, probability=0.05})
     util.remove_ingredient("se-superconductive-cable", "tin-plate")
     util.add_ingredient("se-superconductive-cable", "niobium-tin-cable", 2)