diff --git a/addons/captives/XEH_postInit.sqf b/addons/captives/XEH_postInit.sqf
index 1372b4e10a..fec6e84fbe 100644
--- a/addons/captives/XEH_postInit.sqf
+++ b/addons/captives/XEH_postInit.sqf
@@ -18,7 +18,6 @@ if (isServer) then {
     }];
 };
 
-["playerVehicleChanged", {_this call FUNC(handleVehicleChanged)}] call EFUNC(common,addEventHandler);
 ["zeusDisplayChanged",   {_this call FUNC(handleZeusDisplayChanged)}] call EFUNC(common,addEventHandler);
 ["playerChanged", {_this call FUNC(handlePlayerChanged)}] call EFUNC(common,addEventhandler);
 ["MoveInCaptive", {_this call FUNC(vehicleCaptiveMoveIn)}] call EFUNC(common,addEventHandler);
diff --git a/addons/captives/functions/fnc_handleGetIn.sqf b/addons/captives/functions/fnc_handleGetIn.sqf
index 5476073b38..d89049a031 100644
--- a/addons/captives/functions/fnc_handleGetIn.sqf
+++ b/addons/captives/functions/fnc_handleGetIn.sqf
@@ -26,7 +26,7 @@ if (local _unit) then {
     };
 
     if (_unit getVariable [QGVAR(isSurrendering), false]) then {
-        [_unit, false] call FUNC(setSurrender);
+        [_unit, false] call FUNC(setSurrendered);
     };
 
     if (_unit getVariable [QGVAR(isHandcuffed), false]) then {
diff --git a/addons/common/functions/fnc_resetAllDefaults.sqf b/addons/common/functions/fnc_resetAllDefaults.sqf
index 3040334ad0..164b8f5f3b 100644
--- a/addons/common/functions/fnc_resetAllDefaults.sqf
+++ b/addons/common/functions/fnc_resetAllDefaults.sqf
@@ -18,7 +18,7 @@ _unit setvariable ["ACE_isUnconscious", nil, true];
 if (isPlayer _unit) then {
     [true] call FUNC(setVolume);
     [false] call FUNC(disableKeyInput);
-    if (["ace_medical"] call FUNC(isModLoader)) then {
+    if (["ace_medical"] call FUNC(isModLoaded)) then {
         [false] call EFUNC(medical,effectBlackOut);
     };
 
diff --git a/addons/medical/functions/fnc_addToTriageCard.sqf b/addons/medical/functions/fnc_addToTriageCard.sqf
index 56b2042bc9..76d74f85a7 100644
--- a/addons/medical/functions/fnc_addToTriageCard.sqf
+++ b/addons/medical/functions/fnc_addToTriageCard.sqf
@@ -18,7 +18,7 @@ private ["_log", "_inList", "_amount"];
 params ["_unit", "_newItem"];
 
 if (!local _unit) exitwith {
-    [_this, QUOTE(DFUNC(addToTriageList)), _unit] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */
+    [_this, QUOTE(DFUNC(addToTriageCard)), _unit] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */
 };
 
 _log = _unit getvariable [QGVAR(triageCard), []];
diff --git a/addons/medical/functions/fnc_handleDamage.sqf b/addons/medical/functions/fnc_handleDamage.sqf
index 1a58e2ed01..afcf6e12e5 100644
--- a/addons/medical/functions/fnc_handleDamage.sqf
+++ b/addons/medical/functions/fnc_handleDamage.sqf
@@ -109,7 +109,7 @@ if (_unit getVariable [QGVAR(preventInstaDeath), GVAR(preventInstaDeath)]) exitW
         if (_delayedUnconsicous) then {
             [{
                 [_this select 0, true] call FUNC(setUnconscious);
-            }, [_unit], 0.7, 0] call EFUNC(common,waitAndExec);
+            }, [_unit], 0.7, 0] call EFUNC(common,waitAndExecute);
         } else {
             [{
                 [_this select 0, true] call FUNC(setUnconscious);
diff --git a/addons/medical_menu/functions/fnc_onMenuOpen.sqf b/addons/medical_menu/functions/fnc_onMenuOpen.sqf
index 9f0acfbeb6..fb64865b89 100644
--- a/addons/medical_menu/functions/fnc_onMenuOpen.sqf
+++ b/addons/medical_menu/functions/fnc_onMenuOpen.sqf
@@ -74,7 +74,7 @@ GVAR(MenuPFHID) = [{
     [GVAR(INTERACTION_TARGET)] call FUNC(updateIcons);
     [GVAR(LatestDisplayOptionMenu)] call FUNC(handleUI_DisplayOptions);
 
-    _status = [GVAR(INTERACTION_TARGET)] call FUNC(getTriageStatus);
+    _status = [GVAR(INTERACTION_TARGET)] call EFUNC(medical,getTriageStatus);
     (_display displayCtrl 2000) ctrlSetText (_status select 0);
     (_display displayCtrl 2000) ctrlSetBackgroundColor (_status select 2);
 
diff --git a/addons/mk6mortar/functions/fnc_dev_simulateFindSolution.sqf b/addons/mk6mortar/functions/fnc_dev_simulateFindSolution.sqf
index cfba7c0e05..32a5a314a7 100644
--- a/addons/mk6mortar/functions/fnc_dev_simulateFindSolution.sqf
+++ b/addons/mk6mortar/functions/fnc_dev_simulateFindSolution.sqf
@@ -13,7 +13,7 @@
  * ARRAY - [NUMBER - Elevation In Degrees, NUMBER - Shot Durration]
  *
  * Example:
- * [_rangeToHit, _heightToHit, _muzzleVelocity, _airFriction, TIME_STEP] call FUNC(simulateFindSolution);
+ * [_rangeToHit, _heightToHit, _muzzleVelocity, _airFriction, TIME_STEP] call ace_mk6mortar_fnc_dev_simulateFindSolution;
  *
  * Public: No
  */
diff --git a/addons/scopes/XEH_postInit.sqf b/addons/scopes/XEH_postInit.sqf
index 1f56aecefb..2614da0e19 100644
--- a/addons/scopes/XEH_postInit.sqf
+++ b/addons/scopes/XEH_postInit.sqf
@@ -161,5 +161,3 @@ GVAR(showShortdot) = false;
         };
     };
 }] call EFUNC(common,addEventHandler);
-
-addMissionEventHandler ["Draw3D", {if (GVAR(showShortdot)) then {call FUNC(onDrawShortdot)};}];