diff --git a/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf b/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf
index 2ae2bf2f9c..7a432831ad 100644
--- a/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf
+++ b/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf
@@ -14,10 +14,10 @@
 
 private "_deleted";
 
-
-
 _deleted = 0;
 
+_aceTimeSecond = floor ACE_time;
+
 {
     private ["_bulletVelocity", "_bulletPosition", "_bulletSpeed"];
     _x params["_bullet","_caliber","_bulletTraceVisible","_index"];
@@ -37,7 +37,6 @@ _deleted = 0;
         drop ["\A3\data_f\ParticleEffects\Universal\Refract","","Billboard",1,0.1,getPos _bullet,[0,0,0],0,1.275,1,0,[0.02*_caliber,0.01*_caliber],[[0,0,0,0.65],[0,0,0,0.2]],[1,0],0,0,"","",""];
     };
 
-    _aceTimeSecond = floor ACE_time;
     call compile ("ace_advanced_ballistics" callExtension format["simulate:%1:%2:%3:%4:%5:%6:%7", _index, _bulletVelocity, _bulletPosition, ACE_wind, ASLToATL(_bulletPosition) select 2, _aceTimeSecond, ACE_time - _aceTimeSecond]);
 } forEach GVAR(allBullets);
 
diff --git a/addons/advanced_ballistics/functions/fnc_handleFired.sqf b/addons/advanced_ballistics/functions/fnc_handleFired.sqf
index 74c16bdd47..d97c9b952a 100644
--- a/addons/advanced_ballistics/functions/fnc_handleFired.sqf
+++ b/addons/advanced_ballistics/functions/fnc_handleFired.sqf
@@ -53,7 +53,9 @@ if (!GVAR(simulateForEveryone) && !(local _unit)) then {
 if (GVAR(disabledInFullAutoMode) && getNumber(configFile >> "CfgWeapons" >> _weapon >> _mode >> "autoFire") == 1) then { _abort = true; };
 
 if (_abort || !(GVAR(extensionAvailable))) exitWith {
-    [_bullet, getNumber(configFile >> "CfgAmmo" >> _ammo >> "airFriction")] call EFUNC(winddeflection,updateTrajectoryPFH);
+    if (missionNamespace getVariable [QEGVAR(windDeflection,enabled), false]) then {
+        EGVAR(windDeflection,trackedBullets) pushBack [_bullet, getNumber(configFile >> "cfgAmmo" >> _ammo >> "airFriction")];
+    };
 };
 
 // Get Weapon and Ammo Configurations
diff --git a/addons/cargo/CfgVehicles.hpp b/addons/cargo/CfgVehicles.hpp
index 25bd441b90..1cb82bdff8 100644
--- a/addons/cargo/CfgVehicles.hpp
+++ b/addons/cargo/CfgVehicles.hpp
@@ -49,6 +49,14 @@ class CfgVehicles {
         GVAR(space) = 8;
         GVAR(hasCargo) = 1;
     };
+    class Truck_01_base_F: Truck_F {
+        GVAR(space) = 20;
+        GVAR(hasCargo) = 1;
+    };
+    class B_Truck_01_box_F: Truck_01_base_F {
+        GVAR(space) = 40;
+        GVAR(hasCargo) = 1;
+    };
 
     class Air;
     class Helicopter: Air {
diff --git a/addons/common/functions/fnc__handleNetEvent.sqf b/addons/common/functions/fnc__handleNetEvent.sqf
index 921f2a08f6..3f5f0d0fb4 100644
--- a/addons/common/functions/fnc__handleNetEvent.sqf
+++ b/addons/common/functions/fnc__handleNetEvent.sqf
@@ -24,7 +24,7 @@ if (_eventType == "ACEg") then {
 
         {
             if (!isNil "_x") then {
-                _eventArgs call CALLSTACK_NAMED(_x, FORMAT_2("Net Event %1 ID: %2",_eventName,_forEachIndex);
+                _eventArgs call CALLSTACK_NAMED(_x, FORMAT_2("Net Event %1 ID: %2",_eventName,_forEachIndex));
                 #ifdef DEBUG_EVENTS_CALLSTACK
                     ACE_LOGINFO_1("    ID: %1",_forEachIndex);
                 #endif
diff --git a/addons/interact_menu/XEH_clientInit.sqf b/addons/interact_menu/XEH_clientInit.sqf
index 31dedfbe22..c1a5e63e71 100644
--- a/addons/interact_menu/XEH_clientInit.sqf
+++ b/addons/interact_menu/XEH_clientInit.sqf
@@ -104,3 +104,25 @@ addMissionEventHandler ["Draw3D", DFUNC(render)];
         }];
     };
 }] call EFUNC(common,addEventHandler);
+
+
+//Debug to help end users identify mods that break CBA's XEH
+["SettingsInitialized", {
+    private ["_badClassnames"];
+    _badClassnames = [];
+    {
+        if ((isNil (format [QGVAR(Act_%1), typeOf _x])) || {isNil (format [QGVAR(SelfAct_%1), typeOf _x])}) then {
+            if (!((typeOf _x) in _badClassnames)) then {
+                _badClassnames pushBack (typeOf _x);
+                ACE_LOGERROR_3("Compile checks bad for (classname: %1)(addon: %2) %3", (typeOf _x), (unitAddons (typeOf _x)), _x);
+            };
+        };
+    } forEach (allUnits + allDeadMen + vehicles);
+    if ((count _badClassnames) == 0) then {
+        ACE_LOGINFO("All compile checks passed");
+    } else {
+        ACE_LOGERROR_1("%1 Classnames failed compile check!!! (bad XEH / missing cba_enable_auto_xeh.pbo)", (count _badClassnames));
+        ["ACE Interaction failed to compile for some units (try adding cba_enable_auto_xeh.pbo)"] call BIS_fnc_error;
+    };
+}] call EFUNC(common,addEventHandler);
+
diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp
index c7e5d2c125..e2e42e9695 100644
--- a/addons/main/script_mod.hpp
+++ b/addons/main/script_mod.hpp
@@ -5,8 +5,8 @@
 
 #define MAJOR 3
 #define MINOR 3
-#define PATCHLVL 0
-#define BUILD 2
+#define PATCHLVL 1
+#define BUILD 1
 
 #define VERSION MAJOR.MINOR.PATCHLVL.BUILD
 #define VERSION_AR MAJOR,MINOR,PATCHLVL,BUILD