diff --git a/worldedit/primitives.lua b/worldedit/primitives.lua
index 1317cff..e701239 100644
--- a/worldedit/primitives.lua
+++ b/worldedit/primitives.lua
@@ -299,6 +299,7 @@ function worldedit.spiral(pos, length, height, spacer, node_name)
 		for index = 1, segment_length do
 			-- Move along the direction of the segment
 			i = i + stride_axis * sign
+			column = i
 			-- Add column
 			for y = 1, height do
 				data[column] = node_id
@@ -313,6 +314,7 @@ function worldedit.spiral(pos, length, height, spacer, node_name)
 	sign = -sign
 	for index = 1, segment_length do
 		i = i + stride_axis * sign
+		column = i
 		-- Add column
 		for y = 1, height do
 			data[column] = node_id
diff --git a/worldedit_commands/init.lua b/worldedit_commands/init.lua
index 6458d80..0028c60 100644
--- a/worldedit_commands/init.lua
+++ b/worldedit_commands/init.lua
@@ -45,14 +45,14 @@ local function chatcommand_handler(cmd_name, name, param)
 	if def.nodes_needed then
 		local count = def.nodes_needed(name, unpack(parsed))
 		safe_region(name, count, function()
-			local msg = def.func(name, unpack(parsed))
+			local _, msg = def.func(name, unpack(parsed))
 			if msg then
 				minetest.chat_send_player(name, msg)
 			end
 		end)
 	else
 		-- no "safe region" check
-		local msg = def.func(name, unpack(parsed))
+		local _, msg = def.func(name, unpack(parsed))
 		if msg then
 			minetest.chat_send_player(name, msg)
 		end