diff --git a/addons/dragging/CfgEventHandlers.hpp b/addons/dragging/CfgEventHandlers.hpp
index 463ae20ddc..2821f3d307 100644
--- a/addons/dragging/CfgEventHandlers.hpp
+++ b/addons/dragging/CfgEventHandlers.hpp
@@ -12,9 +12,9 @@ class Extended_PostInit_EventHandlers {
 };
 
 class Extended_Init_EventHandlers {
-    class ThingX {
+    class ReammoBox_F {
         class ADDON {
-            init = QUOTE(if (local (_this select 0)) then {_this call DFUNC(initObject)};);
+            init = QUOTE(_this call DFUNC(initObject));
         };
     };
 };
diff --git a/addons/dragging/CfgVehicles.hpp b/addons/dragging/CfgVehicles.hpp
index e20cc9f6e9..3b7f43fead 100644
--- a/addons/dragging/CfgVehicles.hpp
+++ b/addons/dragging/CfgVehicles.hpp
@@ -2,6 +2,7 @@
 class CfgVehicles {
     class ThingX;
     class ReammoBox_F: ThingX {
+        XEH_ENABLED;
         GVAR(canDrag) = 0;
         GVAR(dragPosition[]) = {0,1,1};
         GVAR(dragDirection) = 0;
diff --git a/addons/dragging/XEH_preInit.sqf b/addons/dragging/XEH_preInit.sqf
index 3825d1b429..ba4327f9e2 100644
--- a/addons/dragging/XEH_preInit.sqf
+++ b/addons/dragging/XEH_preInit.sqf
@@ -2,7 +2,9 @@
 
 ADDON = false;
 
+PREP(canDrag);
 PREP(initObject);
 PREP(setDraggable);
+PREP(startDrag);
 
 ADDON = true;
diff --git a/addons/dragging/functions/fnc_canDrag.sqf b/addons/dragging/functions/fnc_canDrag.sqf
index e69de29bb2..f32a5804e2 100644
--- a/addons/dragging/functions/fnc_canDrag.sqf
+++ b/addons/dragging/functions/fnc_canDrag.sqf
@@ -0,0 +1 @@
+true
\ No newline at end of file
diff --git a/addons/dragging/functions/fnc_setDraggable.sqf b/addons/dragging/functions/fnc_setDraggable.sqf
index 6c068540a6..3e185cf81f 100644
--- a/addons/dragging/functions/fnc_setDraggable.sqf
+++ b/addons/dragging/functions/fnc_setDraggable.sqf
@@ -32,9 +32,9 @@ if (isNil "_direction") then {
 };
 
 // update variables
-_object setVariable [QGVAR(canDrag), _enableDrag, true];
-_object setVariable [QGVAR(dragPosition), _position, true];
-_object setVariable [QGVAR(dragDirection), _direction, true];
+_object setVariable [QGVAR(canDrag), _enableDrag];
+_object setVariable [QGVAR(dragPosition), _position];
+_object setVariable [QGVAR(dragDirection), _direction];
 
 // add action to class if it is not already present
 private ["_type", "_initializedClasses"];
@@ -49,7 +49,5 @@ private ["_name", "_icon", "_selection", "_statement", "_condition"];
 _name = "drag";
 _icon = "";
 _selection = "";
-_statement = {hint str _target};
-_condition = {true};
 
-[_type, 0, [_name], _name, _icon, _selection, _statement, _condition, 2] call EFUNC(interact_menu,addClassAction);
+[_type, 0, [_name], _name, _icon, _selection, FUNC(startDrag), FUNC(canDrag), 2] call EFUNC(interact_menu,addClassAction);
diff --git a/addons/dragging/functions/fnc_startDrag.sqf b/addons/dragging/functions/fnc_startDrag.sqf
index e69de29bb2..324bf850d5 100644
--- a/addons/dragging/functions/fnc_startDrag.sqf
+++ b/addons/dragging/functions/fnc_startDrag.sqf
@@ -0,0 +1,2 @@
+
+hint str _target
diff --git a/addons/interact_menu/functions/fnc_compileMenu.sqf b/addons/interact_menu/functions/fnc_compileMenu.sqf
index e6a2744f03..fe3da17917 100644
--- a/addons/interact_menu/functions/fnc_compileMenu.sqf
+++ b/addons/interact_menu/functions/fnc_compileMenu.sqf
@@ -18,7 +18,7 @@ private ["_objectType","_actionsVarName"];
 _objectType = _target;
 if (typeName _target == "OBJECT") then {
     _objectType = typeOf _target;
-};
+};systemChat _objectType;
 _actionsVarName = format [QGVAR(Act_%1), _objectType];
 
 // Exit if the action menu is already compiled for this class
diff --git a/addons/main/script_macros.hpp b/addons/main/script_macros.hpp
index 33f1037905..8425c4ad1e 100644
--- a/addons/main/script_macros.hpp
+++ b/addons/main/script_macros.hpp
@@ -1,4 +1,5 @@
 #include "\x\cba\addons\main\script_macros_common.hpp"
+#include "\x\cba\addons\xeh\script_xeh.hpp"
 
 // Default versioning level
 #define DEFAULT_VERSIONING_LEVEL 2