diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/BearTrap.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/BearTrap.hpp
index 88bbf25d8..07946fdaa 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/BearTrap.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/BearTrap.hpp
@@ -14,7 +14,7 @@ class TrapBear : CA_Magazine
 		class Build
 		{
 			text = $STR_ACTION_BUILD;
-			script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build; r_action_count = r_action_count + 1;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"TrapBear"};
 			create = "BearTrap_DZ";
diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/CamoNet.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/CamoNet.hpp
index be7c51e47..6937cd50d 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/CamoNet.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/CamoNet.hpp
@@ -14,7 +14,7 @@ class ItemCamoNet : CA_Magazine
 		class Build
 		{
 			text = $STR_BUILD_CAMONET;
-			script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build; r_action_count = r_action_count + 1;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"ItemCamoNet"};
 			create = "CamoNet_DZ";
diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Generator.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Generator.hpp
index 913625b32..315f98c98 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/Generator.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Generator.hpp
@@ -14,7 +14,7 @@ class ItemGenerator : CA_Magazine
 		class Build
 		{
 			text = $STR_ACTION_BUILD;
-			script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build; r_action_count = r_action_count + 1;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"ItemGenerator"};
 			create = "Generator_DZ";
diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Sandbag.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Sandbag.hpp
index 3d10eb25c..ee64f8f7f 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/Sandbag.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Sandbag.hpp
@@ -14,7 +14,7 @@ class ItemSandbag : CA_Magazine
 		class Build
 		{
 			text = $STR_ACTION_BUILD;
-			script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build; r_action_count = r_action_count + 1;";
 			require[] = {"ItemEtool"};
 			consume[] = {"ItemSandbag"};
 			create = "Sandbag1_DZ";
diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/TankTrap.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/TankTrap.hpp
index ba9461abb..15ee797b6 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/TankTrap.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/TankTrap.hpp
@@ -14,7 +14,7 @@ class ItemTankTrap : CA_Magazine
 		class Build
 		{
 			text = $STR_ACTION_BUILD;
-			script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build; r_action_count = r_action_count + 1;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"ItemTankTrap"};
 			create = "Hedgehog_DZ";
diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp
index a8a3f9728..ca2d3d820 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp
@@ -14,7 +14,7 @@ class ItemTent : CA_Magazine
 		class Build
 		{
 			text = $STR_PITCH_TENT;
-			script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build; r_action_count = r_action_count + 1;";
 			require[] = {};
 			consume[] = {"ItemTent"};
 			create = "TentStorage";
@@ -56,7 +56,7 @@ class ItemDomeTent : CA_Magazine
 		class Build
 		{
 			text = $STR_PITCH_DOME_TENT;
-			script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build; r_action_count = r_action_count + 1;";
 			require[] = {};
 			consume[] = {"ItemDomeTent"};
 			create = "DomeTentStorage";
@@ -92,7 +92,7 @@ class ItemDesertTent : CA_Magazine
 		class Build
 		{
 			text = $STR_PITCH_DESERT_TENT;
-			script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build; r_action_count = r_action_count + 1;";
 			require[] = {};
 			consume[] = {"ItemDesertTent"};
 			create = "DesertTentStorage";
diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/TripWire.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/TripWire.hpp
index 448382c24..882f0e3c7 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/TripWire.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/TripWire.hpp
@@ -14,7 +14,7 @@ class ItemTrapTripwireCans : CA_Magazine
 		class Build
 		{
 			text = $STR_ACTION_BUILD;
-			script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build; r_action_count = r_action_count + 1;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"ItemTrapTripwireCans"};
 			create = "Trap_Cans";
diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/WireFence.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/WireFence.hpp
index 1c899da3a..183599a1f 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/WireFence.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/WireFence.hpp
@@ -14,7 +14,7 @@ class ItemWire : CA_Magazine
 		class Build
 		{
 			text = $STR_ACTION_BUILD;
-			script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build; r_action_count = r_action_count + 1;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"ItemWire"};
 			create = "Fort_RazorWire"; // 1.8.7 uses Wire_cat1
diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Workbench.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Workbench.hpp
index 7167ecd70..bb8418c1a 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/Workbench.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Workbench.hpp
@@ -12,7 +12,7 @@ class ItemWorkBench : CA_Magazine
 	class ItemActions {
 		class Build {
 			text = $STR_BLD_build_ItemWorkBench;//"place WorkBench"
-			script = "; ['ItemWorkBench','Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build; r_action_count = r_action_count + 1;";
 			require[] = {};
 			consume[] = {"ItemWorkBench"};
 			create = "WorkBench";
diff --git a/SQF/dayz_code/Configs/CfgVehicles/Traps.hpp b/SQF/dayz_code/Configs/CfgVehicles/Traps.hpp
index 58c5998f4..6e62e8af7 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/Traps.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/Traps.hpp
@@ -10,6 +10,7 @@ class BearTrap_DZ : TrapItems {
 	script = "beartrap"; // compiled script variable name (used by server side loop)
 	initState = 0; // initial armed state
 	singleUse = 0;
+	nounderground = 0;
 
 	class Eventhandlers {
 		init = "['init', _this select 0] spawn beartrap;";
@@ -120,6 +121,7 @@ class TrapBearTrapFlare : TrapItems {
 	armor = 400;
 	displayName = $STR_ITEM_NAME_BEAR_TRAP_FLARE;
 	vehicleClass = "Fortifications";
+	nounderground = 0;
 
 	script = "beartrapflare"; // compiled script variable name (used by server side loop)
 	initState = 1; // initial armed state
@@ -169,6 +171,7 @@ class TrapBearTrapSmoke : TrapItems {
 	armor = 400;
 	displayName = $STR_ITEM_NAME_BEAR_TRAP_SMOKE;
 	vehicleClass = "Fortifications";
+	nounderground = 0;
 
 	script = "beartrapsmoke"; // compiled script variable name (used by server side loop)
 	initState = 1; // initial armed state
@@ -218,6 +221,7 @@ class Trap_Cans : TrapItems {
 	armor = 400;
 	displayName = $STR_ITEM_NAME_TRIPWIRE_CANS;
 	vehicleClass = "Fortifications";
+	nounderground = 0;
 
 	script = "tripcans"; // compiled script variable name (used by server side loop)
 	initState = 1; // initial armed state
@@ -267,6 +271,7 @@ class TrapTripwireFlare : TrapItems {
 	armor = 400;
 	displayName = $STR_ITEM_NAME_TRIPWIRE_FLARE;
 	vehicleClass = "Fortifications";
+	nounderground = 0;
 
 	script = "tripflare"; // compiled script variable name (used by server side loop)
 	initState = 1; // initial armed state
@@ -316,6 +321,7 @@ class TrapTripwireGrenade : TrapItems {
 	armor = 400;
 	displayName = $STR_ITEM_NAME_TRIPWIRE_GRENADE;
 	vehicleClass = "Fortifications";
+	nounderground = 0;
 
 	script = "tripgrenade"; // compiled script variable name (used by server side loop)
 	initState = 1; // initial armed state
@@ -365,6 +371,7 @@ class TrapTripwireSmoke : TrapItems {
 	armor = 400;
 	displayName = $STR_ITEM_NAME_TRIPWIRE_SMOKE;
 	vehicleClass = "Fortifications";
+	nounderground = 0;
 
 	script = "tripsmoke"; // compiled script variable name (used by server side loop)
 	initState = 1; // initial armed state
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp
index 0f697f2e6..43ce81433 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp
@@ -15,7 +15,7 @@ class ItemEtool : ItemCore
 		class Build
 		{
 			text = "Build Sandbag Fence";
-			script = "; ['ItemEtool','Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build; r_action_count = r_action_count + 1;";
 			require[] = {"ItemEtool"};
 			consume[] = {"ItemSandbag"};
 			create = "Sandbag1_DZ";
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp
index 02672c6c2..131f80313 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp
@@ -16,7 +16,7 @@ class ItemShovel : ItemCore
 		class Build
 		{
 			text = "Build Sandbag Fence";
-			script = "; ['ItemShovel','Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build; r_action_count = r_action_count + 1;";
 			require[] = {"ItemShovel"};
 			consume[] = {"ItemSandbag"};
 			create = "Sandbag1_DZ";