diff --git a/addons/explosives/CfgACE_Triggers.hpp b/addons/explosives/CfgACE_Triggers.hpp
index a09f56a995..d6b6597acf 100644
--- a/addons/explosives/CfgACE_Triggers.hpp
+++ b/addons/explosives/CfgACE_Triggers.hpp
@@ -37,7 +37,7 @@ class CfgACE_Triggers {
   class Timer {
     displayName = $STR_ACE_Explosives_timerName;
     picture = "ACE_Explosives\data\UI\Timer.paa";
-    onPlace = QUOTE( [ARR_2(_this select 1, (_this select 3) select 0)] call FUNC(startTimer);false );
+    onPlace = QUOTE( [ARR_2(_this select 1,(_this select 3) select 0)] call FUNC(startTimer);false );
     onSetup = QUOTE( _this call FUNC(openTimerSetUI);true );
   };
   class Tripwire {
diff --git a/addons/explosives/CfgVehicles.hpp b/addons/explosives/CfgVehicles.hpp
index 3049251d36..ad62f17d91 100644
--- a/addons/explosives/CfgVehicles.hpp
+++ b/addons/explosives/CfgVehicles.hpp
@@ -10,7 +10,7 @@ class CfgVehicles {
     class ACE_SelfActions {
       class GVAR(Explosives) {
         displayName = $STR_ACE_Explosives_Menu;
-        condition = QUOTE( !(_player getVariable [ARR_2('ace_explosives_PlantingExplosive', false)]) );
+        condition = QUOTE( !(_player getVariable [ARR_2('ace_explosives_PlantingExplosive',false)]) );
         statement = "";
         exceptions[] = {"ACE_Interaction_isNotSwimming"};
         showDisabled = 1;
@@ -42,7 +42,7 @@ class CfgVehicles {
         class ACE_Defuse {
           displayName = $STR_ACE_Explosives_Defuse;
           condition = QUOTE( [_player] call FUNC(canDefuse) );
-          statement = QUOTE( [ARR_2(_player, EGVAR(Interaction,Target))] call FUNC(startDefuse); );
+          statement = QUOTE( [ARR_2(_player,EGVAR(Interaction,Target))] call FUNC(startDefuse); );
           exceptions[] = {"ACE_Interaction_isNotSwimming"};
           showDisabled = 0;
           icon = QUOTE( PATHTOF(UI\Defuse_ca.paa) );
diff --git a/addons/explosives/functions/fnc_handleScrollWheel.sqf b/addons/explosives/functions/fnc_handleScrollWheel.sqf
index 12c31911e6..ddc64010eb 100644
--- a/addons/explosives/functions/fnc_handleScrollWheel.sqf
+++ b/addons/explosives/functions/fnc_handleScrollWheel.sqf
@@ -20,7 +20,7 @@
 private ["_obj"];
 if (isNull(GVAR(Setup)) || {ACE_Modifier == 0} || !GVAR(pfeh_running)) exitWith {false};
 _this = _this * 5;
-GVAR(Setup) setDir ((getDir GVAR(Setup) + _this);
+GVAR(Setup) setDir ((getDir GVAR(Setup)) + _this);
 GVAR(TweakedAngle) = GVAR(TweakedAngle) + _this;
 
 true
diff --git a/addons/explosives/functions/fnc_openTimerSetUI.sqf b/addons/explosives/functions/fnc_openTimerSetUI.sqf
index dda771f98d..e686fc7539 100644
--- a/addons/explosives/functions/fnc_openTimerSetUI.sqf
+++ b/addons/explosives/functions/fnc_openTimerSetUI.sqf
@@ -22,7 +22,7 @@ createDialog "RscACE_SelectTimeUI";
 sliderSetRange [8845, 5, 900]; // 5seconds - 15minutes
 sliderSetPosition [8845, 30];
 
-buttonSetAction [8860, format[QUOTE([ACE_player, '%1', 'Timer', floor(sliderPosition 8845)] call FUNC(setupExplosive);closeDialog 0;), _mag]];
+buttonSetAction [8860, format[QUOTE([ARR_4(ACE_player,'%1','Timer',floor sliderPosition 8845)] call FUNC(setupExplosive);closeDialog 0;), _mag]];
 buttonSetAction [8855, format[QUOTE(['%1'] call FUNC(openTriggerSelectionUI);), _mag]];
 
 ctrlSetText [8870, format[localize "STR_ACE_Explosives_TimerMenu",0, 30]];
diff --git a/addons/explosives/functions/fnc_setupExplosive.sqf b/addons/explosives/functions/fnc_setupExplosive.sqf
index fdbcb66a2a..7c64771fc5 100644
--- a/addons/explosives/functions/fnc_setupExplosive.sqf
+++ b/addons/explosives/functions/fnc_setupExplosive.sqf
@@ -30,7 +30,7 @@ GVAR(placer) = _unit;
 // Would require custom config entries (ACE_ExplosiveSpecialist/ACE_Specialist) which excludes custom mods.
 //if (ACE_Explosives_RequireSpecialist && {!([_unit] call ACE_Core_fnc_isEOD)}) exitWith {};
 if (isNil "_config") then {
-  _config = getArray(ConfigFile >> "CfgMagazines" >> _class >> "ACE_Triggers" >> "ACE_Triggers") select 0;
+  _config = getArray(ConfigFile >> "CfgMagazines" >> _class >> "ACE_Triggers" >> "SupportedTriggers") select 0;
 };
 
 GVAR(Setup) = getText(ConfigFile >> "CfgMagazines" >> _class >> "ACE_SetupObject") createVehicleLocal [0,0,-10000];
@@ -49,7 +49,7 @@ GVAR(TweakedAngle) = 180;
   private "_player";
   _player = ACE_player;
   if (GVAR(placer) != _player) exitWith {
-    call Func(place_Cancel);
+    call FUNC(place_Cancel);
   };
   GVAR(pfeh_running) = true;
   _pos = (ASLtoATL eyePos _player) vectorAdd (positionCameraToWorld [0,0,1] vectorDiff positionCameraToWorld [0,0,0]);
@@ -62,6 +62,6 @@ GVAR(TweakedAngle) = 180;
 [localize "STR_ACE_Explosives_PlaceAction", localize "STR_ACE_Explosives_CancelAction",
   localize "STR_ACE_Explosives_ScrollAction"] call EFUNC(Interaction,showMouseHint);
 _unit setVariable [QGVAR(Place), [_unit, "DefaultAction",
-  {GVAR(pfeh_running) AND !isNull (GVAR(Setup))}, {call Func(place_Approve);}] call EFUNC(Core,AddActionEventHandler)];
+  {GVAR(pfeh_running) AND !isNull (GVAR(Setup))}, {call FUNC(place_Approve);}] call EFUNC(Core,AddActionEventHandler)];
 _unit setVariable [QGVAR(Cancel), [_unit, "MenuBack",
-  {GVAR(pfeh_running) AND !isNull (GVAR(Setup))}, {call Func(place_Cancel);}] call EFUNC(Core,AddActionEventHandler)];
+  {GVAR(pfeh_running) AND !isNull (GVAR(Setup))}, {call FUNC(place_Cancel);}] call EFUNC(Core,AddActionEventHandler)];
diff --git a/addons/explosives/functions/fnc_startDefuse.sqf b/addons/explosives/functions/fnc_startDefuse.sqf
index abc44a6475..2270f6b56d 100644
--- a/addons/explosives/functions/fnc_startDefuse.sqf
+++ b/addons/explosives/functions/fnc_startDefuse.sqf
@@ -49,7 +49,7 @@ if (ACE_player != _unit) then {
       (_this select 0) disableAI "MOVE";
       (_this select 0) disableAI "TARGET";
       sleep (_this select 2);
-      [(_this select 0), (_this select 1)] call Func(defuseExplosive);
+      [(_this select 0), (_this select 1)] call FUNC(defuseExplosive);
       (_this select 0) enableAI "MOVE";
       (_this select 0) enableAI "TARGET";
     };
@@ -59,10 +59,10 @@ if (ACE_player != _unit) then {
   if (GVAR(RequireSpecialist)) then {
     if ([_unit] call EFUNC(Common,isEOD)) then {
       [[true, _target] call _fnc_DefuseTime, [_unit,_target],
-        QUOTE(FUNC(defuseExplosive)), localize "STR_ACE_Explosives_DefusingExplosive"] call EFUNC(Common,progressBar);
+        QFUNC(defuseExplosive), localize "STR_ACE_Explosives_DefusingExplosive"] call EFUNC(Common,progressBar);
     };
   } else {
     [[([_unit] call EFUNC(Common,isEOD)), _target] call _fnc_DefuseTime, [_unit,_target],
-    QUOTE(FUNC(defuseExplosive)), localize "STR_ACE_Explosives_DefusingExplosive"] call EFUNC(Common,progressBar);
+    QFUNC(defuseExplosive), localize "STR_ACE_Explosives_DefusingExplosive"] call EFUNC(Common,progressBar);
   };
 };