diff --git a/addons/circulation/CfgVehicles.hpp b/addons/circulation/CfgVehicles.hpp
index 46db1b6e3..a3f7f2e16 100644
--- a/addons/circulation/CfgVehicles.hpp
+++ b/addons/circulation/CfgVehicles.hpp
@@ -303,7 +303,7 @@ class CfgVehicles {
                         showDisabled = 0;
                         icon = QPATHTOF(ui\icon_aedx_volume_off.paa);
                     };
-                    class KAT_AED_X_addSound : AED_X_removeSound {
+                    class KAT_AED_X_addSound : KAT_AED_X_removeSound {
                         displayName = CSTRING(AEDX_Action_EnableAudio);
                         condition = QUOTE(!(_player getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_Volume), false])));
                         statement = QUOTE(_player setVariable [ARR_3(QQGVAR(AED_X_VitalsMonitor_Volume), true, true)]);
diff --git a/addons/main/script_macros.hpp b/addons/main/script_macros.hpp
index 6fea1250a..b2aaa17bd 100644
--- a/addons/main/script_macros.hpp
+++ b/addons/main/script_macros.hpp
@@ -38,7 +38,7 @@
 #define GETEGVAR(var1,var2,var3) GETMVAR(EGVAR(var1,var2),var3)
 
 #define ARR_SELECT(ARRAY,INDEX,DEFAULT) (if (count ARRAY > INDEX) then {ARRAY select INDEX} else {DEFAULT})
-
+#define ANY_OF(ARRAY,CONDITION) (ARRAY findIf {CONDITION} != -1)
 
 #define MACRO_ADDWEAPON(WEAPON,COUNT) class _xx_##WEAPON { \
     weapon = #WEAPON; \
@@ -245,4 +245,4 @@
 #define GET_BLOODPRESSURE_CHANGE(unit) (unit getVariable [VAR_BLOODPRESSURE_CHANGE, [0,0]])
 
 // Pharmacy
-#define GET_BLOOD_LOSS(unit)           ([unit] call EFUNC(pharma,getBloodLoss))
\ No newline at end of file
+#define GET_BLOOD_LOSS(unit)           ([unit] call EFUNC(pharma,getBloodLoss))
diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp
index a55a75139..670aa5518 100644
--- a/addons/main/script_mod.hpp
+++ b/addons/main/script_mod.hpp
@@ -7,13 +7,13 @@
 
 #define VERSION     MAJOR.MINOR
 #define VERSION_STR MAJOR.MINOR.PATCH
-#define VERSION_AR  MAJOR,MINOR,PATCH
+#define VERSION_AR  MAJOR,MINOR,PATCHLVL,BUILD
 
 #define VERSION_CONFIG version = MAJOR.MINOR; versionStr = QUOTE(MAJOR.MINOR.PATCH); versionAr[] = {MAJOR,MINOR,PATCH}
 
 // MINIMAL required version for the Mod. Components can specify others..
-#define REQUIRED_VERSION 1.88
-#define REQUIRED_CBA_VERSION {3,8,0}
+#define REQUIRED_VERSION 2.14
+#define REQUIRED_CBA_VERSION {3,15,7}
 
 #ifdef COMPONENT_BEAUTIFIED
     #define COMPONENT_NAME QUOTE(KAT - COMPONENT_BEAUTIFIED)
diff --git a/addons/misc/functions/fnc_treatmentSuccess.sqf b/addons/misc/functions/fnc_treatmentSuccess.sqf
index 2e3d30f1d..0095e5b6c 100644
--- a/addons/misc/functions/fnc_treatmentSuccess.sqf
+++ b/addons/misc/functions/fnc_treatmentSuccess.sqf
@@ -38,7 +38,7 @@ if (!isNil "_endInAnim") then {
 [QACEGVAR(common,setAnimSpeedCoef), [_medic, 1]] call CBA_fnc_globalEvent;
 
 if (!isNil QACEGVAR(advanced_fatigue,setAnimExclusions)) then {
-    ACEGVAR(advanced_fatigue,setAnimExclusions) deleteAt (ACEGVAR(advanced_fatigue,setAnimExclusions) find QUOTE(ACE_ADDON));
+    ACEGVAR(advanced_fatigue,setAnimExclusions) deleteAt (ACEGVAR(advanced_fatigue,setAnimExclusions) find QUOTE(ACE_ADDON(medical_treatment)));
 };
 
 // Call treatment specific success callback
diff --git a/include/a3/ui_f/$PBOPREFIX$ b/include/a3/ui_f/$PBOPREFIX$
new file mode 100644
index 000000000..bcaad3e8c
--- /dev/null
+++ b/include/a3/ui_f/$PBOPREFIX$
@@ -0,0 +1 @@
+a3\ui_f
\ No newline at end of file
diff --git a/include/x/cba/addons/main/$PBOPREFIX$ b/include/x/cba/addons/main/$PBOPREFIX$
new file mode 100644
index 000000000..835b0c9a0
--- /dev/null
+++ b/include/x/cba/addons/main/$PBOPREFIX$
@@ -0,0 +1 @@
+x\cba\addons\main
\ No newline at end of file
diff --git a/include/x/cba/addons/xeh/$PBOPREFIX$ b/include/x/cba/addons/xeh/$PBOPREFIX$
new file mode 100644
index 000000000..45339387f
--- /dev/null
+++ b/include/x/cba/addons/xeh/$PBOPREFIX$
@@ -0,0 +1 @@
+x\cba\addons\xeh
\ No newline at end of file