diff --git a/tools/cba/addons/main/script_macros_common.hpp b/tools/cba/addons/main/script_macros_common.hpp
index 78893db662..d205bfc975 100644
--- a/tools/cba/addons/main/script_macros_common.hpp
+++ b/tools/cba/addons/main/script_macros_common.hpp
@@ -199,7 +199,7 @@ Parameters:
 
 Example:
     (begin example)
-        ERROR("Value not found","value of frog not found in config ...yada...yada...");
+        ERROR("value of frog not found in config ...yada...yada...");
     (end)
 
 Author:
@@ -674,8 +674,9 @@ Author:
     Sickboy
 ------------------------------------------- */
 #define GVAR(var1) DOUBLES(ADDON,var1)
-#define EGVAR(var1,var2) DOUBLES(DOUBLES(PREFIX,var1),var2)
+#define EGVAR(var1,var2) TRIPLES(PREFIX,var1,var2)
 #define QGVAR(var1) QUOTE(GVAR(var1))
+#define QEGVAR(var1,var2) QUOTE(EGVAR(var1,var2))
 
 /* -------------------------------------------
 Macro: GVARMAIN()
@@ -694,6 +695,7 @@ Author:
     Sickboy
 ------------------------------------------- */
 #define GVARMAIN(var1) GVARMAINS(PREFIX,var1)
+#define QGVARMAIN(var1) QUOTE(GVARMAIN(var1))
 // TODO: What's this?
 #define SETTINGS DOUBLES(PREFIX,settings)
 #define CREATELOGIC CREATELOGICS(PREFIX,COMPONENT)
diff --git a/tools/cba/addons/xeh/init_pre.sqf b/tools/cba/addons/xeh/init_pre.sqf
index 44b4657aca..1b6642c777 100644
--- a/tools/cba/addons/xeh/init_pre.sqf
+++ b/tools/cba/addons/xeh/init_pre.sqf
@@ -356,5 +356,11 @@ SLX_XEH_STR spawn {
 */
 { (_x/SLX_XEH_STR_PreInit) call FUNC(init_once) } forEach SLX_XEH_CONFIG_FILES;
 
-
-XEH_LOG("XEH: PreInit Finished. " + PFORMAT_3("CACHE DISABLED? (Disable caching with cba_cache_disable.pbo)",SLX_XEH_RECOMPILE,CBA_COMPILE_RECOMPILE,CBA_FUNC_RECOMPILE));
+private "_s";
+// Normally, full caching is enabled. If not, log an informative message.
+_s = if (SLX_XEH_RECOMPILE || CBA_COMPILE_RECOMPILE || CBA_FUNC_RECOMPILE) then {
+    PFORMAT_3(" CACHE DISABLED? (Disable caching with cba_cache_disable.pbo)",SLX_XEH_RECOMPILE,CBA_COMPILE_RECOMPILE,CBA_FUNC_RECOMPILE)
+} else {
+    ""
+};
+XEH_LOG("XEH: PreInit Finished." + _s);
diff --git a/tools/cba/addons/xeh/script_xeh.hpp b/tools/cba/addons/xeh/script_xeh.hpp
index ba55dbc917..4f242b492e 100644
--- a/tools/cba/addons/xeh/script_xeh.hpp
+++ b/tools/cba/addons/xeh/script_xeh.hpp
@@ -40,6 +40,7 @@ local              = "_this call SLX_XEH_EH_Local"; \
 respawn            = "_this call SLX_XEH_EH_Respawn"; \
 put                = "_this call SLX_XEH_EH_Put"; \
 take               = "_this call SLX_XEH_EH_Take"; \
+seatSwitched       = "_this call SLX_XEH_EH_SeatSwitched"; \
 soundPlayed        = "_this call SLX_XEH_EH_SoundPlayed"; \
 weaponAssembled    = "_this call SLX_XEH_EH_WeaponAssembled"; \
 weaponDisAssembled = "_this call SLX_XEH_EH_WeaponDisassembled";
@@ -51,11 +52,11 @@ weaponDisAssembled = "_this call SLX_XEH_EH_WeaponDisassembled";
 
 
 
-/*
+/* 
    MACRO: DELETE_EVENTHANDLERS
 
    Removes all event handlers.
-
+ 
   Example:
  (begin example)
     class DefaultEventhandlers;
@@ -103,6 +104,7 @@ delete local;  \
 delete respawn;  \
 delete put;  \
 delete take; \
+delete seatSwitched; \
 delete soundPlayed; \
 delete weaponAssembled; \
 delete weaponDisAssembled;