diff --git a/mods/ENTITIES/drippingwater/init.lua b/mods/ENTITIES/drippingwater/init.lua
index 9aad3eb880..efa37fd2ad 100644
--- a/mods/ENTITIES/drippingwater/init.lua
+++ b/mods/ENTITIES/drippingwater/init.lua
@@ -13,6 +13,7 @@ minetest.register_entity("drippingwater:drop_water", {
 	physical = true,
 	collide_with_objects = false,
 	collisionbox = {0,0,0,0,0,0},
+	pointable = false,
 	visual = "cube",
 	visual_size = {x=0.05, y=0.1},
 	textures = {water_tex, water_tex, water_tex, water_tex, water_tex, water_tex},
diff --git a/mods/ENTITIES/mcl_item_entity/init.lua b/mods/ENTITIES/mcl_item_entity/init.lua
index f0184ea0b7..54a568f990 100644
--- a/mods/ENTITIES/mcl_item_entity/init.lua
+++ b/mods/ENTITIES/mcl_item_entity/init.lua
@@ -306,6 +306,7 @@ core.register_entity(":__builtin:item", {
 		physical = true,
 		collide_with_objects = false,
 		collisionbox = {-0.3, -0.3, -0.3, 0.3, 0.3, 0.3},
+		pointable = false,
 		visual = "wielditem",
 		visual_size = {x = 0.4, y = 0.4},
 		textures = {""},
diff --git a/mods/ITEMS/mcl_banners/init.lua b/mods/ITEMS/mcl_banners/init.lua
index a04d88ed5a..d1df29d078 100644
--- a/mods/ITEMS/mcl_banners/init.lua
+++ b/mods/ITEMS/mcl_banners/init.lua
@@ -468,7 +468,7 @@ local entity_standing = {
 	mesh = "amc_banner.b3d",
 	visual_size = { x=2.499, y=2.499 },
 	textures = make_banner_texture(),
-	collisionbox = { 0, 0, 0, 0, 0, 0 },
+	pointable = false,
 
 	_base_color = nil, -- base color of banner
 	_layers = nil, -- table of layers painted over the base color.
diff --git a/mods/ITEMS/mcl_end/eye_of_ender.lua b/mods/ITEMS/mcl_end/eye_of_ender.lua
index e15beb50bf..69edbde357 100644
--- a/mods/ITEMS/mcl_end/eye_of_ender.lua
+++ b/mods/ITEMS/mcl_end/eye_of_ender.lua
@@ -5,6 +5,7 @@ minetest.register_entity("mcl_end:ender_eye", {
 	textures = {"mcl_end_ender_eye.png"},
 	visual_size = {x=1.5, y=1.5},
 	collisionbox = {0,0,0,0,0,0},
+	pointable = false,
 
 	-- Save and restore age
 	get_staticdata = function(self)
diff --git a/mods/ITEMS/mcl_itemframes/init.lua b/mods/ITEMS/mcl_itemframes/init.lua
index 52ceb6fc36..104379be13 100644
--- a/mods/ITEMS/mcl_itemframes/init.lua
+++ b/mods/ITEMS/mcl_itemframes/init.lua
@@ -2,8 +2,8 @@ minetest.register_entity("mcl_itemframes:item",{
 	hp_max = 1,
 	visual = "wielditem",
 	visual_size = {x=0.3,y=0.3},
-	collisionbox = {0,0,0,0,0,0},
 	physical = false,
+	pointable = false,
 	textures = { "empty.png" },
 	_texture = "empty.png",
 
diff --git a/mods/ITEMS/mcl_mobspawners/init.lua b/mods/ITEMS/mcl_mobspawners/init.lua
index dc74b23f00..61b72af37e 100644
--- a/mods/ITEMS/mcl_mobspawners/init.lua
+++ b/mods/ITEMS/mcl_mobspawners/init.lua
@@ -318,8 +318,8 @@ minetest.register_node("mcl_mobspawners:spawner", {
 
 local doll_def = {
 	hp_max = 1,
-	physical = true,
-	collisionbox = {0,0,0,0,0,0},
+	physical = false,
+	pointable = false,
 	visual = "mesh",
 	makes_footstep_sound = false,
 	timer = 0,
diff --git a/mods/ITEMS/mcl_signs/init.lua b/mods/ITEMS/mcl_signs/init.lua
index 280d02b5e9..67fdf43e1a 100644
--- a/mods/ITEMS/mcl_signs/init.lua
+++ b/mods/ITEMS/mcl_signs/init.lua
@@ -429,7 +429,7 @@ minetest.register_node("mcl_signs:standing_sign67_5", ssign67)
 
 -- FIXME: Prevent entity destruction by /clearobjects
 minetest.register_entity("mcl_signs:text", {
-	collisionbox = { 0, 0, 0, 0, 0, 0 },
+	pointable = false,
 	visual = "upright_sprite",
 	textures = {},
 	physical = false,
diff --git a/mods/ITEMS/mcl_throwing/init.lua b/mods/ITEMS/mcl_throwing/init.lua
index c2402d3280..f8c90dcf1f 100644
--- a/mods/ITEMS/mcl_throwing/init.lua
+++ b/mods/ITEMS/mcl_throwing/init.lua
@@ -78,6 +78,7 @@ local snowball_ENTITY={
 	textures = {"mcl_throwing_snowball.png"},
 	visual_size = {x=0.5, y=0.5},
 	collisionbox = {0,0,0,0,0,0},
+	pointable = false,
 
 	get_staticdata = get_staticdata,
 	on_activate = on_activate,
@@ -90,6 +91,7 @@ local egg_ENTITY={
 	textures = {"mcl_throwing_egg.png"},
 	visual_size = {x=0.45, y=0.45},
 	collisionbox = {0,0,0,0,0,0},
+	pointable = false,
 
 	get_staticdata = get_staticdata,
 	on_activate = on_activate,
@@ -103,6 +105,7 @@ local pearl_ENTITY={
 	textures = {"mcl_throwing_ender_pearl.png"},
 	visual_size = {x=0.9, y=0.9},
 	collisionbox = {0,0,0,0,0,0},
+	pointable = false,
 
 	get_staticdata = get_staticdata,
 	on_activate = on_activate,
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor_stand/init.lua b/mods/ITEMS/minetest-3d_armor/3d_armor_stand/init.lua
index c3571a6bc4..b23d069ce9 100644
--- a/mods/ITEMS/minetest-3d_armor/3d_armor_stand/init.lua
+++ b/mods/ITEMS/minetest-3d_armor/3d_armor_stand/init.lua
@@ -238,6 +238,7 @@ minetest.register_entity("3d_armor_stand:armor_entity", {
 	mesh = "3d_armor_entity.obj",
 	visual_size = {x=1, y=1},
 	collisionbox = {-0.1,-0.4,-0.1, 0.1,1.3,0.1},
+	pointable = false,
 	textures = {"3d_armor_trans.png"},
 	pos = nil,
 	timer = 0,