diff --git a/basic_machines/forceload.lua b/basic_machines/forceload.lua
index 2be2b05..fb06ad9 100644
--- a/basic_machines/forceload.lua
+++ b/basic_machines/forceload.lua
@@ -258,7 +258,7 @@ minetest.register_on_joinplayer(function(player)
 	local lPos = {}
 	for _,pos in ipairs(get_pos_list(player)) do
 		local node = techage.get_node_lvm(pos)
-		if node.name == "techage:forceload" then
+		if node.name == "techage:forceload" or node.name == "techage:forceloadtile" then
 			minetest.forceload_block(pos, true)
 			lPos[#lPos+1] = pos
 		end
diff --git a/logic/terminal.lua b/logic/terminal.lua
index 644a588..ed553ad 100644
--- a/logic/terminal.lua
+++ b/logic/terminal.lua
@@ -148,7 +148,7 @@ local function command(pos, command, player)
 				end
 				return
 			end
-			local bttn_num, label, cmnd = command:match('^set%s+([1-9])%s+(%w+)%s+(.+)$')
+			local bttn_num, label, cmnd = command:match('^set%s+([1-9])%s+([%w_]+)%s+(.+)$')
 			if bttn_num and label and cmnd then
 				meta:set_string("bttn_text"..bttn_num, label)
 				meta:set_string("bttn_cmnd"..bttn_num, cmnd)