diff --git a/addons/frag/XEH_postInit.sqf b/addons/frag/XEH_postInit.sqf
index 063060551b..92708f0e05 100644
--- a/addons/frag/XEH_postInit.sqf
+++ b/addons/frag/XEH_postInit.sqf
@@ -2,19 +2,10 @@
 
 ["CBA_settingsInitialized", {
         if (isServer) then {
-            [QGVAR(frag_eh), LINKFUNC(doFrag)] call CBA_fnc_addEventHandler;
-            [QGVAR(spall_eh), LINKFUNC(doFragMomentum)] call CBA_fnc_addEventHandler;
             [] call FUNC(initBlackList);
             [] call FUNC(initMaterialCache);
         };
         
-        /*if (hasInterface) then {
-            ["ace_firedPlayer", LINKFUNC(fired)] call CBA_fnc_addEventHandler;
-            ["ace_firedPlayerVehicle", LINKFUNC(fired)] call CBA_fnc_addEventHandler;
-        };
-
-        ["ace_firedNonPlayer", LINKFUNC(fired)] call CBA_fnc_addEventHandler;
-        ["ace_firedNonPlayerVehicle", LINKFUNC(fired)] call CBA_fnc_addEventHandler;*/
 
 #ifdef DEBUG_MODE_DRAW
         if (hasInterface && GVAR(debugOptions)) then {
@@ -27,8 +18,6 @@
 }] call CBA_fnc_addEventHandler;
 
 
-// Debug stuff:
-
 #ifdef LOG_FRAG_INFO
 [true, true, 30] call FUNC(dev_debugAmmo);
 #endif
diff --git a/addons/frag/functions/fnc_initRound.sqf b/addons/frag/functions/fnc_initRound.sqf
index bab13a28e8..f8fa2a4df6 100644
--- a/addons/frag/functions/fnc_initRound.sqf
+++ b/addons/frag/functions/fnc_initRound.sqf
@@ -58,7 +58,7 @@ if (GVAR(spallEnabled) && {_shouldSpall}) then
             [
                 QGVAR(spall_eh),
                 [_proj, _hitObj, _posASL, _vel, _sNorm, _surfType, _ammo, _shotPrnt, _vUp]
-            ] call CBA_fnc_serverEvent;
-        };
+            ] call CBA_fnc_execNextFrame;
+        }
     ];
 };
\ No newline at end of file