diff --git a/Bio_Industries_2/data-final-fixes.lua b/Bio_Industries_2/data-final-fixes.lua
index 35efde1..81fe6dd 100644
--- a/Bio_Industries_2/data-final-fixes.lua
+++ b/Bio_Industries_2/data-final-fixes.lua
@@ -377,7 +377,7 @@ if not fertilizer.place_as_tile then
   fertilizer.place_as_tile = {
     result = AlienBiomes and "vegetation-green-grass-3" or "grass-3",
     condition_size = 1,
-    condition = { "water-tile" }
+    condition = { layers = { water_tile = true }}
   }
   fertilizer.icon = ICONPATH .. "fertilizer_64.png"
   fertilizer.icon_size = 64
@@ -394,7 +394,7 @@ end
 data.raw.item["bi-adv-fertilizer"].place_as_tile = {
   result = AlienBiomes and "vegetation-green-grass-1" or "grass-1",
   condition_size = 1,
-  condition = { "water-tile" }
+  condition = { layers = { water_tile = true }}
 }
 
 if mods["pycoalprocessing"] and BI.Settings.BI_Bio_Fuel then
diff --git a/Bio_Industries_2/data-updates.lua b/Bio_Industries_2/data-updates.lua
index d39d239..a7fd529 100644
--- a/Bio_Industries_2/data-updates.lua
+++ b/Bio_Industries_2/data-updates.lua
@@ -82,7 +82,7 @@ if not mods["Dectorio"] then
   data.raw.item["wood"].place_as_tile = {
     result = "bi-wood-floor",
     condition_size = 4,
-    condition = { "water-tile" }
+    condition = { layers = { water_tile = true }}
   }
 end
 
@@ -352,7 +352,7 @@ if data.raw["item"]["bob-greenhouse"] then
   data.raw["item"]["fertilizer"].place_as_tile = {
     result = BioInd.AB_tiles() and "vegetation-green-grass-3" or "grass-3",
     condition_size = 1,
-    condition = { "water-tile" }
+    condition = { layers = { water_tile = true }}
   }
 end
 
diff --git a/Bio_Industries_2/prototypes/Bio_Farm/item.lua b/Bio_Industries_2/prototypes/Bio_Farm/item.lua
index b727179..77ed59c 100644
--- a/Bio_Industries_2/prototypes/Bio_Farm/item.lua
+++ b/Bio_Industries_2/prototypes/Bio_Farm/item.lua
@@ -19,10 +19,6 @@ data:extend(
     },
     icon_mipmaps = 4,
     pictures = {
-      --~ { size = 64, filename = ICONPATHMIPS.."bio_seed_1.png", scale = 0.25, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."bio_seed_2.png", scale = 0.25, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."bio_seed_3.png", scale = 0.25, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."bio_seed_4.png", scale = 0.25, mipmap_count = 1 }
       { size = 64, filename = ICONPATHMIPS.."bio_seed_1.png", scale = 0.25 },
       { size = 64, filename = ICONPATHMIPS.."bio_seed_2.png", scale = 0.25 },
       { size = 64, filename = ICONPATHMIPS.."bio_seed_3.png", scale = 0.25 },
@@ -52,15 +48,6 @@ data:extend(
     },
         icon_mipmaps = 9,
     pictures = {
-      --~ { size = 64, filename = ICONPATHMIPS.."Seedling_1.png", scale = 0.25, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."Seedling_2.png", scale = 0.25, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."Seedling_3.png", scale = 0.25, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."Seedling_4.png", scale = 0.25, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."Seedling_5.png", scale = 0.25, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."Seedling_6.png", scale = 0.25, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."Seedling_7.png", scale = 0.25, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."Seedling_8.png", scale = 0.25, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."Seedling_9.png", scale = 0.25, mipmap_count = 1 }
       { size = 64, filename = ICONPATHMIPS.."Seedling_1.png", scale = 0.25 },
       { size = 64, filename = ICONPATHMIPS.."Seedling_2.png", scale = 0.25 },
       { size = 64, filename = ICONPATHMIPS.."Seedling_3.png", scale = 0.25 },
@@ -171,10 +158,6 @@ data:extend(
     },
     icon_mipmaps = 4,
     pictures = {
-      --~ { size = 64, filename = ICONPATHMIPS.."Woodpulp_1.png", scale = 0.2, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."Woodpulp_2.png", scale = 0.2, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."Woodpulp_3.png", scale = 0.2, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."Woodpulp_4.png", scale = 0.2, mipmap_count = 1 }
       { size = 64, filename = ICONPATHMIPS.."Woodpulp_1.png", scale = 0.2 },
       { size = 64, filename = ICONPATHMIPS.."Woodpulp_2.png", scale = 0.2 },
       { size = 64, filename = ICONPATHMIPS.."Woodpulp_3.png", scale = 0.2 },
@@ -221,17 +204,11 @@ data:extend(
     },
     icon_mipmaps = 4,
     pictures = {
-      --~ { size = 64, filename = ICONPATHMIPS.."Ash_1.png", scale = 0.2, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."Ash_2.png", scale = 0.2, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."Ash_3.png", scale = 0.2, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."Ash_4.png", scale = 0.2, mipmap_count = 1 }
       { size = 64, filename = ICONPATHMIPS.."Ash_1.png", scale = 0.2 },
       { size = 64, filename = ICONPATHMIPS.."Ash_2.png", scale = 0.2 },
       { size = 64, filename = ICONPATHMIPS.."Ash_3.png", scale = 0.2 },
       { size = 64, filename = ICONPATHMIPS.."Ash_4.png", scale = 0.2 }
     },
-    --~ fuel_value = "1MJ",
-    --~ fuel_category = "chemical",
     subgroup = "raw-material",
     order = "a[bi]-a-b[bi-ash]",
     stack_size = 400
@@ -251,10 +228,6 @@ data:extend(
     },
     icon_mipmaps = 4,
     pictures = {
-      --~ { size = 64, filename = ICONPATHMIPS.."Charcoal_1.png", scale = 0.2, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."Charcoal_2.png", scale = 0.2, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."Charcoal_3.png", scale = 0.2, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."Charcoal_4.png", scale = 0.2, mipmap_count = 1 }
       { size = 64, filename = ICONPATHMIPS.."Charcoal_1.png", scale = 0.2 },
       { size = 64, filename = ICONPATHMIPS.."Charcoal_2.png", scale = 0.2 },
       { size = 64, filename = ICONPATHMIPS.."Charcoal_3.png", scale = 0.2 },
@@ -303,10 +276,6 @@ data:extend(
     },
     icon_mipmaps = 4,
     pictures = {
-      --~ { size = 64, filename = ICONPATHMIPS.."Crush_1.png", scale = 0.2, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."Crush_2.png", scale = 0.2, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."Crush_3.png", scale = 0.2, mipmap_count = 1 },
-      --~ { size = 64, filename = ICONPATHMIPS.."Crush_4.png", scale = 0.2, mipmap_count = 1 }
       { size = 64, filename = ICONPATHMIPS.."Crush_1.png", scale = 0.2 },
       { size = 64, filename = ICONPATHMIPS.."Crush_2.png", scale = 0.2 },
       { size = 64, filename = ICONPATHMIPS.."Crush_3.png", scale = 0.2 },
@@ -314,8 +283,6 @@ data:extend(
     },
     subgroup = "raw-material",
     order = "a[bi]-a-z[stone-crushed]",
-    -- Changed for 0.18.34/1.1.4
-    --~ stack_size = 800
     stack_size = 400
   },
 
@@ -543,13 +510,6 @@ data:extend(
       subgroup = "intermediate-product",
       order = "b[fertilizer]",
       stack_size = 200,
-      -- 0.18.31/1.1.1: Moved to data-final-fixes.lua because we changed the name
-      -- fron "fertiliser" to "fertilizer" and now PyAlienLife removes place_as_tile!
-      --~ place_as_tile = {
-        --~ result = "vegetation-green-grass-3",
-        --~ condition_size = 1,
-        --~ condition = { "water-tile" }
-      --~ },
     },
 
     --- Adv fertilizer
@@ -567,14 +527,6 @@ data:extend(
       subgroup = "intermediate-product",
       order = "b[fertilizer]-b[bi-adv-fertilizer]",
       stack_size = 200,
-      -- 0.18.31/1.1.1: Moved to data-final-fixes.lua because we changed the name
-      -- from "bi-adv-fertiliser" to "bi-adv-fertilizer" and now PyAlienLife removes
-      -- place_as_tile!
-      --~ place_as_tile = {
-        --~ result = "vegetation-green-grass-1",
-        --~ condition_size = 1,
-        --~ condition = { "water-tile" }
-      --~ },
     },
   })
 
diff --git a/Bio_Industries_2/prototypes/Bio_Solar_Farm/item.lua b/Bio_Industries_2/prototypes/Bio_Solar_Farm/item.lua
index ab60ac6..f51c161 100644
--- a/Bio_Industries_2/prototypes/Bio_Solar_Farm/item.lua
+++ b/Bio_Industries_2/prototypes/Bio_Solar_Farm/item.lua
@@ -45,7 +45,7 @@ if BI.Settings.BI_Solar_Additions then
       place_as_tile = {
         result = "bi-solar-mat",
         condition_size = 4,
-        condition = { "water-tile" }
+        condition = { layers = { water_tile = true }}
       }
     },