diff --git a/addons/cookoff/CfgVehicles.hpp b/addons/cookoff/CfgVehicles.hpp
index 687edf354c..c5924612e6 100644
--- a/addons/cookoff/CfgVehicles.hpp
+++ b/addons/cookoff/CfgVehicles.hpp
@@ -55,14 +55,18 @@ class CfgVehicles {
     };
 
     class MRAP_01_base_F: Car_F {
-        GVAR(engineSmokeOffset)[] = {0,-4,2};
+        GVAR(engineSmokeOffset)[] = {0,-2,0};
     };
 
     class MRAP_02_base_F: Car_F {
-        GVAR(engineSmokeOffset)[] = {0,-4,2};
+        GVAR(engineSmokeOffset)[] = {0,-2,0};
     };
 
     class MRAP_03_base_F: Car_F {
-        GVAR(engineSmokeOffset)[] = {0,-4,2};
+        GVAR(engineSmokeOffset)[] = {0,-2,0};
+    };
+
+    class Quadbike_01_base_F: Car_F {
+        GVAR(engineSmokeOffset)[] = {0,1,0};
     };
 };
diff --git a/addons/cookoff/functions/fnc_engineFire.sqf b/addons/cookoff/functions/fnc_engineFire.sqf
index db5a431c8b..580bd5d54d 100644
--- a/addons/cookoff/functions/fnc_engineFire.sqf
+++ b/addons/cookoff/functions/fnc_engineFire.sqf
@@ -27,13 +27,13 @@ if (local _vehicle) then {
 private _offset = getArray (_vehicle call CBA_fnc_getObjectConfig >> QGVAR(engineSmokeOffset));
 
 if (_offset isEqualTo []) then {
-    _offset = [0,-2,2];
+    _offset = [0,0,0];
 };
 
 private _position = [
     0,
-    (boundingBoxReal _vehicle select 1 select 1),
-    (boundingBoxReal _vehicle select 0 select 2)
+    (boundingBoxReal _vehicle select 1 select 1) - 2,
+    (boundingBoxReal _vehicle select 0 select 2) + 2
 ] vectorAdd _offset;
 
 private _smoke = "#particlesource" createVehicleLocal [0,0,0];
diff --git a/addons/repair/CfgVehicles.hpp b/addons/repair/CfgVehicles.hpp
index a3eb0ecde3..15627dc893 100644
--- a/addons/repair/CfgVehicles.hpp
+++ b/addons/repair/CfgVehicles.hpp
@@ -15,7 +15,7 @@
         }; \
     };
 
-class CBA_Extended_EventHandlers;
+class CBA_Extended_EventHandlers_base;
 
 class CfgVehicles {
     class ACE_Module;
@@ -311,14 +311,14 @@ class CfgVehicles {
     class ThingX;
     class ACE_RepairItem_Base: ThingX {
         class EventHandlers {
-            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
         };
 
         icon = "iconObject_circle";
         mapSize = 0.7;
         accuracy = 0.2;
         vehicleClass = "ACE_Logistics_Items";
-        destrType = "DestructBuilding";
+        destrType = "DesturctNo"; // scripted delayed destruction
     };
 
     class ACE_Track: ACE_RepairItem_Base {
diff --git a/addons/repair/XEH_preInit.sqf b/addons/repair/XEH_preInit.sqf
index a7feade1c3..7d9578b8ec 100644
--- a/addons/repair/XEH_preInit.sqf
+++ b/addons/repair/XEH_preInit.sqf
@@ -4,4 +4,10 @@ ADDON = false;
 
 #include "XEH_PREP.hpp"
 
+["ACE_RepairItem_Base", "killed", {
+    params ["_object"];
+
+    [{deleteVehicle _this}, _object, 5] call CBA_fnc_waitAndExecute;
+}] call CBA_fnc_addClassEventHandler;
+
 ADDON = true;