diff --git a/addons/explosives/functions/fnc_place_Approve.sqf b/addons/explosives/functions/fnc_place_Approve.sqf
index fd127ab271..67f985ff14 100644
--- a/addons/explosives/functions/fnc_place_Approve.sqf
+++ b/addons/explosives/functions/fnc_place_Approve.sqf
@@ -18,7 +18,7 @@
 */
 #include "\z\ace\explosives\script_component.hpp"
 if (GVAR(pfeh_running)) then {
-	[QGVAR(Placement),"OnEachFrame"] call BIS_fnc_removeStackedEventHandler;
+	[QGVAR(Placement),"OnEachFrame"] call CALLSTACK(BIS_fnc_removeStackedEventHandler);
 	GVAR(pfeh_running) = false;
 };
 private ["_mag", "_setup", "_player"];
diff --git a/addons/explosives/functions/fnc_place_Cancel.sqf b/addons/explosives/functions/fnc_place_Cancel.sqf
index 1d5ddd498e..e3bf212e21 100644
--- a/addons/explosives/functions/fnc_place_Cancel.sqf
+++ b/addons/explosives/functions/fnc_place_Cancel.sqf
@@ -18,7 +18,7 @@
 */
 #include "\z\ace\explosives\script_component.hpp"
 if (GVAR(pfeh_running)) then {
-	[QGVAR(Placement),"OnEachFrame"] call BIS_fnc_removeStackedEventHandler;
+	[QGVAR(Placement),"OnEachFrame"] call CALLSTACK(BIS_fnc_removeStackedEventHandler);
 	GVAR(pfeh_running) = false;
 };
 if (!isNull (GVAR(Setup))) then {
diff --git a/addons/explosives/functions/fnc_setPosition.sqf b/addons/explosives/functions/fnc_setPosition.sqf
index a915da08df..9e51e8f7b0 100644
--- a/addons/explosives/functions/fnc_setPosition.sqf
+++ b/addons/explosives/functions/fnc_setPosition.sqf
@@ -23,6 +23,6 @@ private "_ex";
 _ex=_this select 0;
 _ex setDir (_this select 1);
 if ((_this select 2) != 0) then {
-	[_ex, _this select 2, 0] call BIS_fnc_setPitchBank;
+	[_ex, _this select 2, 0] call CALLSTACK(BIS_fnc_setPitchBank);
 };
 //_ex setVectorUp (surfaceNormal _pos);
diff --git a/addons/explosives/functions/fnc_setupExplosive.sqf b/addons/explosives/functions/fnc_setupExplosive.sqf
index 2a1ece30fd..570fc71b22 100644
--- a/addons/explosives/functions/fnc_setupExplosive.sqf
+++ b/addons/explosives/functions/fnc_setupExplosive.sqf
@@ -58,7 +58,7 @@ GVAR(TweakedAngle) = 180;
   if (ACE_Modifier == 0) then {
     GVAR(Setup) setDir (GVAR(TweakedAngle) + getDir _player);
   };
-}] call BIS_fnc_addStackedEventHandler;
+}] call CALLSTACK(BIS_fnc_addStackedEventHandler);
 [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",
diff --git a/addons/explosives/functions/fnc_startTimer.sqf b/addons/explosives/functions/fnc_startTimer.sqf
index 2fc0e20dfc..cd7cdffeca 100644
--- a/addons/explosives/functions/fnc_startTimer.sqf
+++ b/addons/explosives/functions/fnc_startTimer.sqf
@@ -18,13 +18,10 @@
 		[_explosive, 10] call ACE_Explosives_fnc_startTimer;
 */
 #include "\z\ace\explosives\script_component.hpp"
-_this spawn { // TODO: use scheduled delay execution
-	private ["_explosive", "_timer"];
+[{
+	private ["_explosive"];
 	_explosive = _this select 0;
-	_timer = _this select 1;
-
-	sleep _timer;
 	if (!isNull _explosive) then {
 		[_explosive, -1, [_explosive, 0], true] call FUNC(detonateExplosive);
 	};
-};
+},_this select 1, _this] call CALLSTACK(CBA_fnc_addPerFrameHandler);