diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 7a025568b..61679b193 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -13,11 +13,8 @@ minetest.register_node("default:barrier", {
 	stack_max = 64,
 	sunlight_propagates = true,
 	is_ground_content = false,
-	groups = { not_in_creative_inventory = 1 },
+	groups = { not_in_creative_inventory = 1, oddly_breakable_by_hand = 5 },
 	on_blast = function() end,
-	on_destruct = function () end,
-	can_dig = function() return false end,
-	diggable = false,
 })
 
 minetest.register_node("default:stone", {
@@ -986,9 +983,6 @@ minetest.register_node("default:bedrock", {
 	sounds = default.node_sound_stone_defaults(),
 	is_ground_content = false,
 	on_blast = function() end,
-	on_destruct = function () end,
-	can_dig = function() return false end,
-	diggable = false,
 	drop = '',
 })
 
diff --git a/mods/redstone/mesecons_commandblock/init.lua b/mods/redstone/mesecons_commandblock/init.lua
index 6e6a48a57..a6b76bdbb 100644
--- a/mods/redstone/mesecons_commandblock/init.lua
+++ b/mods/redstone/mesecons_commandblock/init.lua
@@ -178,12 +178,10 @@ minetest.register_node("mesecons_commandblock:commandblock_off", {
 	description = "Command Block",
 	tiles = {"jeija_commandblock_off.png"},
 	inventory_image = minetest.inventorycube("jeija_commandblock_off.png"),
-	groups = {mesecon_effector_off=1, not_in_creative_inventory=1},
+	groups = {mesecon_effector_off=1, not_in_creative_inventory=1, oddly_breakable_by_hand=5},
 	drop = "",
 	diggable = false,
-	can_dig = function() return false end,
 	on_blast = function() end,
-	on_destruct = function() end,
 	on_construct = construct,
 	is_ground_content = false,
 	after_place_node = after_place,
@@ -197,12 +195,9 @@ minetest.register_node("mesecons_commandblock:commandblock_off", {
 
 minetest.register_node("mesecons_commandblock:commandblock_on", {
 	tiles = {"jeija_commandblock_on.png"},
-	groups = {mesecon_effector_on=1, not_in_creative_inventory=1},
+	groups = {mesecon_effector_on=1, not_in_creative_inventory=1, oddly_breakable_by_hand=5},
 	drop = "",
-	diggable = false,
-	can_dig = function() return false end,
 	on_blast = function() end,
-	on_destruct = function() end,
 	on_construct = construct,
 	is_ground_content = false,
 	after_place_node = after_place,