diff --git a/addons/cargo/CfgVehicles.hpp b/addons/cargo/CfgVehicles.hpp
index 9811feb219..767c414361 100644
--- a/addons/cargo/CfgVehicles.hpp
+++ b/addons/cargo/CfgVehicles.hpp
@@ -152,7 +152,8 @@ class CfgVehicles {
         GVAR(size) = 50;
         XEH_ENABLED;
     };
-    class Land_Cargo20_military_ruins_F: Cargo_base_F {
+    class Ruins_F;
+    class Land_Cargo20_military_ruins_F: Ruins_F {
         GVAR(space) = 49;
         GVAR(size) = 50;
         XEH_ENABLED;
@@ -224,7 +225,7 @@ class CfgVehicles {
         GVAR(size) = 100;
         XEH_ENABLED;
     };
-    class Land_Cargo40_military_ruins_F: Cargo_base_F {
+    class Land_Cargo40_military_ruins_F: Ruins_F {
         GVAR(space) = 99;
         GVAR(size) = 100;
         XEH_ENABLED;
diff --git a/addons/cargo/functions/fnc_canLoadItemIn.sqf b/addons/cargo/functions/fnc_canLoadItemIn.sqf
index e777e2dd53..5d844cc91c 100644
--- a/addons/cargo/functions/fnc_canLoadItemIn.sqf
+++ b/addons/cargo/functions/fnc_canLoadItemIn.sqf
@@ -3,8 +3,8 @@
  * Check if item can be loaded into other Object
  *
  * Arguments:
- * 0: Any object <OBJECT>
- * 1: Object <OBJECT>
+ * 0: Item Object <OBJECT>
+ * 1: Holder Object (vehicle) <OBJECT>
  *
  * Return value:
  * Can load in <BOOL>
diff --git a/addons/cargo/functions/fnc_canUnloadItem.sqf b/addons/cargo/functions/fnc_canUnloadItem.sqf
index 2770528a63..74b4c1bb9e 100644
--- a/addons/cargo/functions/fnc_canUnloadItem.sqf
+++ b/addons/cargo/functions/fnc_canUnloadItem.sqf
@@ -14,7 +14,7 @@
 
 #include "script_component.hpp"
 
-private ["_loaded", "_position", "_validVehiclestate", "_emptyPos"];
+private ["_loaded", "_validVehiclestate", "_emptyPos"];
 params ["_item", "_vehicle"];
 _loaded = _vehicle getvariable [QGVAR(loaded), []];
 if !(_item in _loaded) exitwith {false};
diff --git a/addons/cargo/functions/fnc_handleDestroyed.sqf b/addons/cargo/functions/fnc_handleDestroyed.sqf
index b235631a89..25e7a6a4e0 100644
--- a/addons/cargo/functions/fnc_handleDestroyed.sqf
+++ b/addons/cargo/functions/fnc_handleDestroyed.sqf
@@ -15,6 +15,8 @@
 
 params ["_vehicle"];
 
+private["_loaded"];
+
 _loaded = _vehicle getvariable [QGVAR(loaded), []];
 if (count _loaded == 0) exitwith {};
 
diff --git a/addons/cargo/functions/fnc_initVehicle.sqf b/addons/cargo/functions/fnc_initVehicle.sqf
index 7a03d3a1de..48e83c3858 100644
--- a/addons/cargo/functions/fnc_initVehicle.sqf
+++ b/addons/cargo/functions/fnc_initVehicle.sqf
@@ -49,8 +49,8 @@ SETMVAR(GVAR(initializedClasses),_initializedClasses);
 if (getNumber (configFile >> "CfgVehicles" >> _type >> QGVAR(hasCargo)) != 1) exitwith {};
 
 private ["_text", "_condition", "_statement", "_icon", "_action"];
-_text = localize "STR_ACE_Cargo_openMenu";
 _condition = {GVAR(enable)};
+_text = localize LSTRING(openMenu);
 _statement = {GVAR(interactionVehicle) = _target; createDialog QGVAR(menu);};
 _icon = "";
 
diff --git a/addons/cargo/functions/fnc_onMenuOpen.sqf b/addons/cargo/functions/fnc_onMenuOpen.sqf
index 766a22f612..8c3bbfecf2 100644
--- a/addons/cargo/functions/fnc_onMenuOpen.sqf
+++ b/addons/cargo/functions/fnc_onMenuOpen.sqf
@@ -41,5 +41,5 @@ uiNamespace setvariable [QGVAR(menuDisplay), _display];
         true
     } count _loaded;
 
-    _label ctrlSetText format[localize "STR_ACE_Cargo_labelSpace", [GVAR(interactionVehicle)] call DFUNC(getCargoSpaceLeft)];
+    _label ctrlSetText format[localize LSTRING(labelSpace), [GVAR(interactionVehicle)] call DFUNC(getCargoSpaceLeft)];
 }, 0, []] call CBA_fnc_addPerFrameHandler;