diff --git a/mods/farming/crops/soy.lua b/mods/farming/crops/soy.lua
index eec33f3e..c7ca8488 100644
--- a/mods/farming/crops/soy.lua
+++ b/mods/farming/crops/soy.lua
@@ -42,15 +42,6 @@ minetest.register_node("farming:soy_sauce", {
 	sounds = default.node_sound_glass_defaults()
 })
 
--- river water availability check
-local bucket_water
-
-if minetest.get_mapgen_setting("mgname") == "valleys"
-or minetest.get_modpath("ethereal") then
-	bucket_water = "bucket:bucket_river_water"
-else
-	bucket_water = "bucket:bucket_water"
-end
 
 -- soy sauce recipe
 minetest.register_craft( {
@@ -58,10 +49,10 @@ minetest.register_craft( {
 	recipe = {
 		{"group:food_soy", "group:food_salt", "group:food_soy"},
 		{"", "group:food_juicer", ""},
-		{"", bucket_water, "vessels:glass_bottle"}
+		{"", "bucket:bucket_water", "vessels:glass_bottle"}
 	},
 	replacements = {
-		{bucket_water, "bucket:bucket_empty"},
+		{"bucket:bucket_water", "bucket:bucket_empty"},
 		{"group:food_juicer", "farming:juicer"}
 	}
 })
diff --git a/mods/farming/food.lua b/mods/farming/food.lua
index 3be519e8..4c4d7c31 100644
--- a/mods/farming/food.lua
+++ b/mods/farming/food.lua
@@ -29,6 +29,16 @@ minetest.register_craft({
 	replacements = {{"bucket:bucket_river_water", "bucket:bucket_empty"}}
 })
 
+minetest.register_craft({
+	output = "farming:glass_water 4",
+	recipe = {
+		{"vessels:drinking_glass", "vessels:drinking_glass"},
+		{"vessels:drinking_glass", "vessels:drinking_glass"},
+		{"bucket:bucket_water", "farming:hemp_fibre"}
+	},
+	replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}}
+})
+
 --= Sugar
 
 minetest.register_craftitem("farming:sugar", {
@@ -675,10 +685,10 @@ minetest.register_craft({
 	recipe = {
 		{"group:food_rice", "group:food_sugar", "group:food_rice"},
 		{"", "group:food_mortar_pestle", ""},
-		{"", "bucket:bucket_river_water", ""}
+		{"", "farming:glass_water", ""}
 	},
 	replacements = {
 		{"group:food_mortar_pestle", "farming:mortar_pestle"},
-		{"bucket:bucket_river_water", "bucket:bucket_empty"}
+		{"farming:glass_water", "vessels:drinking_glass"}
 	}
 })
diff --git a/mods/mobs_animal/depends.txt b/mods/mobs_animal/depends.txt
index 3168c5af..6eca2d8a 100644
--- a/mods/mobs_animal/depends.txt
+++ b/mods/mobs_animal/depends.txt
@@ -1,4 +1,4 @@
-default
 mobs
+default?
 lucky_block?
 intllib?
diff --git a/mods/mobs_animal/mod.conf b/mods/mobs_animal/mod.conf
index 2cc67154..1a31db8e 100644
--- a/mods/mobs_animal/mod.conf
+++ b/mods/mobs_animal/mod.conf
@@ -1,4 +1,4 @@
 name = mobs_animal
-depends = default, mobs
-optional_depends = lucky_block, intllib
+depends = mobs
+optional_depends = default, lucky_block, intllib
 description = Adds farm animals.
diff --git a/mods/mobs_monster/depends.txt b/mods/mobs_monster/depends.txt
index 9648cd24..8d14ca3e 100644
--- a/mods/mobs_monster/depends.txt
+++ b/mods/mobs_monster/depends.txt
@@ -1,5 +1,5 @@
-default
 mobs
+default?
 lucky_block?
 toolranks?
 intllib?
diff --git a/mods/mobs_monster/mod.conf b/mods/mobs_monster/mod.conf
index 7979671c..921bed15 100644
--- a/mods/mobs_monster/mod.conf
+++ b/mods/mobs_monster/mod.conf
@@ -1,4 +1,4 @@
 name = mobs_monster
-depends = default, mobs
-optional_depends = lucky_block, toolranks, intllib
+depends = mobs
+optional_depends = default, lucky_block, toolranks, intllib
 description = Adds many types of monsters.
diff --git a/mods/mobs_npc/depends.txt b/mods/mobs_npc/depends.txt
index 3168c5af..6eca2d8a 100644
--- a/mods/mobs_npc/depends.txt
+++ b/mods/mobs_npc/depends.txt
@@ -1,4 +1,4 @@
-default
 mobs
+default?
 lucky_block?
 intllib?
diff --git a/mods/mobs_npc/mod.conf b/mods/mobs_npc/mod.conf
index dd5b139d..1cdfb4a1 100644
--- a/mods/mobs_npc/mod.conf
+++ b/mods/mobs_npc/mod.conf
@@ -1,4 +1,4 @@
 name = mobs_npc
-depends = default, mobs
-optional_depends = lucky_block, intllib
+depends = mobs
+optional_depends = default, lucky_block, intllib
 description = Adds simple NPC and Trader.