diff --git a/addons/repair/CfgEditorSubcategories.hpp b/addons/main/CfgEditorSubcategories.hpp
similarity index 55%
rename from addons/repair/CfgEditorSubcategories.hpp
rename to addons/main/CfgEditorSubcategories.hpp
index 3010929ec5..baf892a3c5 100644
--- a/addons/repair/CfgEditorSubcategories.hpp
+++ b/addons/main/CfgEditorSubcategories.hpp
@@ -1,5 +1,5 @@
 class CfgEditorSubcategories {
     class GVAR(subcategory) {
-        displayName = ECSTRING(main,Category_Logistics);
+        displayName = CSTRING(Category_Logistics);
     };
 };
diff --git a/addons/main/config.cpp b/addons/main/config.cpp
index 15a4a0edcb..e04f573e62 100644
--- a/addons/main/config.cpp
+++ b/addons/main/config.cpp
@@ -906,3 +906,4 @@ class CfgMods {
 #include "CfgSettings.hpp"
 #include "CfgModuleCategories.hpp"
 #include "CfgVehicleClasses.hpp"
+#include "CfgEditorSubcategories.hpp"
diff --git a/addons/repair/CfgVehicles.hpp b/addons/repair/CfgVehicles.hpp
index a67b3035fc..a5067029e1 100644
--- a/addons/repair/CfgVehicles.hpp
+++ b/addons/repair/CfgVehicles.hpp
@@ -322,7 +322,7 @@ class CfgVehicles {
         accuracy = 0.2;
         vehicleClass = "ACE_Logistics_Items";
         editorCategory = "EdCat_Supplies";
-        editorSubcategory = QGVAR(subcategory);
+        editorSubcategory = QEGVAR(main,subcategory);
     };
 
     class ACE_Track: ACE_RepairItem_Base {
diff --git a/addons/repair/config.cpp b/addons/repair/config.cpp
index 8e71005eb2..1dbe9b46b1 100644
--- a/addons/repair/config.cpp
+++ b/addons/repair/config.cpp
@@ -21,4 +21,3 @@ class CfgPatches {
 #include "CfgEventHandlers.hpp"
 #include "CfgMoves.hpp"
 #include "CfgVehicles.hpp"
-#include "CfgEditorSubcategories.hpp"
diff --git a/addons/tripod/CfgVehicles.hpp b/addons/tripod/CfgVehicles.hpp
index 10d43cb87e..78d1f69fa7 100644
--- a/addons/tripod/CfgVehicles.hpp
+++ b/addons/tripod/CfgVehicles.hpp
@@ -49,6 +49,7 @@ class CfgVehicles {
         scope = 2;
         displayName = CSTRING(DisplayName);
         model = QPATHTOF(data\sniper_tripod.p3d);
+        icon = "\A3\Static_F_Gamma\data\UI\map_StaticTurret_AT_CA.paa";
 
         class AnimationSources {
             class slide_down_tripod {
@@ -96,8 +97,8 @@ class CfgVehicles {
             };
         };
 
-        editorCategory = "EdCat_Equipment";
-        editorSubcategory = "EdSubcat_InventoryItems";
+        editorCategory = "EdCat_Supplies";
+        editorSubcategory = QEGVAR(main,subcategory);
         editorPreview = QPATHTOF(data\preview_tripod.jpg);
     };
 };
diff --git a/addons/tripod/XEH_preInit.sqf b/addons/tripod/XEH_preInit.sqf
index b47cf6628d..0b9469c746 100644
--- a/addons/tripod/XEH_preInit.sqf
+++ b/addons/tripod/XEH_preInit.sqf
@@ -6,4 +6,9 @@ PREP_RECOMPILE_START;
 #include "XEH_PREP.hpp"
 PREP_RECOMPILE_END;
 
+["ACE_TripodObject", "killed", {
+    params ["_tripod"];
+    [{deleteVehicle _this}, _tripod, 5] call CBA_fnc_waitAndExecute;
+}] call CBA_fnc_addClassEventHandler;
+
 ADDON = true;
diff --git a/addons/tripod/script_component.hpp b/addons/tripod/script_component.hpp
index 683cdf042d..0fb3359553 100644
--- a/addons/tripod/script_component.hpp
+++ b/addons/tripod/script_component.hpp
@@ -2,9 +2,9 @@
 #define COMPONENT_BEAUTIFIED Tripod
 #include "\z\ace\addons\main\script_mod.hpp"
 
-// #define DEBUG_MODE_FULL
-// #define DISABLE_COMPILE_CACHE
-// #define ENABLE_PERFORMANCE_COUNTERS
+#define DEBUG_MODE_FULL
+#define DISABLE_COMPILE_CACHE
+//#define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_TRIPOD
     #define DEBUG_MODE_FULL