diff --git a/addons/disposable/CfgEventHandlers.hpp b/addons/disposable/CfgEventHandlers.hpp
index 1ce0c446e2..d91d142259 100644
--- a/addons/disposable/CfgEventHandlers.hpp
+++ b/addons/disposable/CfgEventHandlers.hpp
@@ -14,7 +14,7 @@ class Extended_FiredBIS_EventHandlers {
   class CAManBase {
     class ADDON {
       // firedBIS = "if (local (_this select 0)) then {_this call AGM_Disposable_fnc_replaceATWeapon};";
-      firedBIS = QUOTE( _this call FUNC(replaceATWeapon); );
+      firedBIS = QUOTE( _this call FUNC(replaceATWeapon) );
     };
   };
 };
@@ -23,7 +23,8 @@ class Extended_FiredBIS_EventHandlers {
 class Extended_Init_EventHandlers {
   class CAManBase {
     class ADDON {
-      init = "if (local (_this select 0)) then {_this spawn {[_this select 0, secondaryWeapon (_this select 0)] call AGM_Disposable_fnc_takeLoadedATWeapon}};";
+      // init = "if (local (_this select 0)) then {_this spawn {[_this select 0, secondaryWeapon (_this select 0)] call AGM_Disposable_fnc_takeLoadedATWeapon}};";
+      init = QUOTE( _this call FUNC(takeLoadedATWeapon) );
     };
   };
 };
@@ -31,7 +32,8 @@ class Extended_Init_EventHandlers {
 class Extended_Take_EventHandlers {
   class CAManBase {
     class ADDON {
-      take = "if (local (_this select 0)) then {[_this select 0, _this select 2] call AGM_Disposable_fnc_takeLoadedATWeapon; [_this select 0, findDisplay 602] call AGM_Disposable_fnc_updateInventoryDisplay};";
+      // take = "if (local (_this select 0)) then {[_this select 0, _this select 2] call AGM_Disposable_fnc_takeLoadedATWeapon; [_this select 0, findDisplay 602] call AGM_Disposable_fnc_updateInventoryDisplay};";
+      take = QUOTE( _this call FUNC(takeLoadedATWeapon);  _this call FUNC(updateInventoryDisplay); );
     };
   };
 };
@@ -39,7 +41,8 @@ class Extended_Take_EventHandlers {
 class Extended_Put_EventHandlers {
   class CAManBase {
     class ADDON {
-      put = "if (local (_this select 0)) then {[_this select 0, findDisplay 602] call AGM_Disposable_fnc_updateInventoryDisplay};";
+      // put = "if (local (_this select 0)) then {[_this select 0, findDisplay 602] call AGM_Disposable_fnc_updateInventoryDisplay};";
+      take = QUOTE( _this call FUNC(updateInventoryDisplay); );
     };
   };
 };
diff --git a/addons/disposable/CfgMagazines.hpp b/addons/disposable/CfgMagazines.hpp
index 45ff3153da..993d53f46c 100644
--- a/addons/disposable/CfgMagazines.hpp
+++ b/addons/disposable/CfgMagazines.hpp
@@ -4,7 +4,7 @@ class CfgMagazines {
     author = "$STR_ACE_Common_ACETeam";
     scope = 1;
     displayName = "$STR_ACE_Disposable_PreloadedMissileDummy";
-    picture = "\AGM_Core\UI\blank_CO.paa";
+    picture = PATHTOEF(common,UI\blank_CO.paa);
     weaponPoolAvailable = 0;
     mass = 0;
   };
diff --git a/addons/disposable/config.cpp b/addons/disposable/config.cpp
index 92fc2c88ac..49ae873674 100644
--- a/addons/disposable/config.cpp
+++ b/addons/disposable/config.cpp
@@ -8,7 +8,7 @@ class CfgPatches {
     requiredAddons[] = {"ace_common"};
     author[] = {"commy2"};
     authorUrl = "https://github.com/commy2/";
-    VERSION_CONFIG
+    // VERSION_CONFIG @todo
   };
 };
 
diff --git a/addons/disposable/functions/fn_replaceATWeapon.sqf b/addons/disposable/functions/fnc_replaceATWeapon.sqf
similarity index 100%
rename from addons/disposable/functions/fn_replaceATWeapon.sqf
rename to addons/disposable/functions/fnc_replaceATWeapon.sqf
diff --git a/addons/disposable/functions/fn_takeLoadedATWeapon.sqf b/addons/disposable/functions/fnc_takeLoadedATWeapon.sqf
similarity index 89%
rename from addons/disposable/functions/fn_takeLoadedATWeapon.sqf
rename to addons/disposable/functions/fnc_takeLoadedATWeapon.sqf
index db54a71bba..4f53eb7bef 100644
--- a/addons/disposable/functions/fn_takeLoadedATWeapon.sqf
+++ b/addons/disposable/functions/fnc_takeLoadedATWeapon.sqf
@@ -15,7 +15,11 @@
 private ["_unit", "_launcher", "_config"];
 
 _unit = _this select 0;
-_launcher = _this select 1;
+_launcher = secondaryWeapon _unit;
+
+systemChat format ["Take %1 - %2", _unit, _launcher];
+
+if (!local _unit) exitWith {};
 
 _config = configFile >> "CfgWeapons" >> _launcher;
 
diff --git a/addons/disposable/functions/fn_updateInventoryDisplay.sqf b/addons/disposable/functions/fnc_updateInventoryDisplay.sqf
similarity index 92%
rename from addons/disposable/functions/fn_updateInventoryDisplay.sqf
rename to addons/disposable/functions/fnc_updateInventoryDisplay.sqf
index 12455b340f..cb8c1ffd99 100644
--- a/addons/disposable/functions/fn_updateInventoryDisplay.sqf
+++ b/addons/disposable/functions/fnc_updateInventoryDisplay.sqf
@@ -15,14 +15,14 @@
 private ["_player", "_display"];
 
 _player = _this select 0;
+if (!local _player) exitWith {};
 
 _player removeMagazines "ACE_PreloadedMissileDummy";
 _player removeMagazines "ACE_FiredMissileDummy";
 
 disableSerialization;
-_display = _this select 1;
-
-if (isNull _display) exitWith {};
+_display = findDisplay 602;
+if (isNull _display) exitWith {systemChat "null";};
 
 private ["_launcher", "_control", "_config"];