diff --git a/bucket/init.lua b/bucket/init.lua
index 99d464a..6dcb731 100644
--- a/bucket/init.lua
+++ b/bucket/init.lua
@@ -254,8 +254,6 @@ minetest.register_craftitem("bucket:bucket_empty", {
 			return
 		end
 
-		itemstack = ItemStack("bucket:bucket_empty")
-
 		-- Node IO Support
 		local usedef = ndef
 		local defpref = "node_io_"
diff --git a/fluid_lib/nodeio.lua b/fluid_lib/nodeio.lua
index c37d7e6..6461a5c 100644
--- a/fluid_lib/nodeio.lua
+++ b/fluid_lib/nodeio.lua
@@ -2,10 +2,10 @@
 -- Node IO System
 local nodeiodef = {
 	node_io_can_put_liquid = function (pos, node, side)
-		return ele.helpers.get_item_group(node.name, 'fluid_container')
+		return minetest.get_item_group(node.name, 'fluid_container') > 0
 	end,
 	node_io_can_take_liquid = function (pos, node, side)
-		return ele.helpers.get_item_group(node.name, 'fluid_container')
+		return minetest.get_item_group(node.name, 'fluid_container') > 0
 	end,
 		-- if false, transfer node should only put and take in 1000 increments
 		-- inventory nodes that don't accept milibuckets should: