diff --git a/bzgas2/compatibility/electronic-circuit.lua b/bzgas2/compatibility/electronic-circuit.lua
index 1dc0e02..74a3440 100644
--- a/bzgas2/compatibility/electronic-circuit.lua
+++ b/bzgas2/compatibility/electronic-circuit.lua
@@ -18,7 +18,7 @@ util.add_ingredient("electronic-circuit", "bakelite", amt)
 util.set_icons("electronic-circuit", nil)
 
 
-if util.me.handcraft() then
+if util.me.handcraft() and not mods["aai-industry"] then
   data:extend({{ type = "recipe-category", name = "handcraft-only" }})
   for i, character in pairs(data.raw.character) do
     if character and character.crafting_categories then
diff --git a/bzgas2/data-final-fixes.lua b/bzgas2/data-final-fixes.lua
index dfa6292..e39b171 100644
--- a/bzgas2/data-final-fixes.lua
+++ b/bzgas2/data-final-fixes.lua
@@ -15,6 +15,10 @@ if mods.Krastorio2 and
   table.insert(data.raw["assembling-machine"]["basic-chemical-plant"].energy_source.fuel_categories , "kr-vehicle-fuel")
 end
 
+if mods["aai-industry"] and not mods["Krastorio2"] then
+  util.remove_prerequisite("basic-chemistry", "basic-fluid-handling")
+end
+
 -- Vanilla burner phase tweaks -- green circuits after electronics
 -- Electronic circuit recipe set below in compatibility script
 if not mods.Krastorio2 and not mods["aai-industry"] and not mods.bzaluminum2 and not mods["bzcarbon2"] then
diff --git a/bzgas2/prototypes/bakelite.lua b/bzgas2/prototypes/bakelite.lua
index 4597f08..e4815d1 100644
--- a/bzgas2/prototypes/bakelite.lua
+++ b/bzgas2/prototypes/bakelite.lua
@@ -5,6 +5,8 @@ if mods["Krastorio2"] then
   table.insert(prereq, "steel-processing")
 elseif mods["bzfoundry2"] then
   table.insert(prereq, "foundry")
+elseif mods["aai-industry"] then
+  table.insert(prereq, "automation")
 end
 
 data:extend({
diff --git a/bzgas2/prototypes/gas-extractor.lua b/bzgas2/prototypes/gas-extractor.lua
index cd9c3ae..e7f3508 100644
--- a/bzgas2/prototypes/gas-extractor.lua
+++ b/bzgas2/prototypes/gas-extractor.lua
@@ -13,7 +13,7 @@ if mods.Krastorio2 then
   ge_prereq = {"kr-stone-processing"}
 elseif mods["aai-industry"] then
   table.insert(ge_ingredients, {type="item", name="sand", amount=10})
-  ge_prereq = {"sand-processing"}
+  ge_prereq = {"sand-processing", "basic-fluid-handling"}
 elseif data.raw.item["silica"] and data.raw.technology["silica-processing"] then
   table.insert(ge_ingredients, {type="item", name="silica", amount=20})
   ge_prereq = {"silica-processing"}