diff --git a/addons/disposable/script_component.hpp b/addons/disposable/script_component.hpp
index ccaca1431..1478b6a09 100644
--- a/addons/disposable/script_component.hpp
+++ b/addons/disposable/script_component.hpp
@@ -13,7 +13,6 @@
     #define DEBUG_SETTINGS DEBUG_SETTINGS_DISPOSABLE
 #endif
 
-#define DEBUG_MODE_NORMAL
 #define DEBUG_SYNCHRONOUS
 #include "\x\cba\addons\main\script_macros.hpp"
 
diff --git a/addons/optics/script_component.hpp b/addons/optics/script_component.hpp
index 6d36320a1..17de53308 100644
--- a/addons/optics/script_component.hpp
+++ b/addons/optics/script_component.hpp
@@ -13,7 +13,6 @@
     #define DEBUG_SETTINGS DEBUG_SETTINGS_OPTICS
 #endif
 
-#define DEBUG_MODE_NORMAL
 #define DEBUG_SYNCHRONOUS
 #include "\x\cba\addons\main\script_macros.hpp"
 
diff --git a/addons/xeh/fnc_addClassEventHandler.sqf b/addons/xeh/fnc_addClassEventHandler.sqf
index 755b13295..03ad03c19 100644
--- a/addons/xeh/fnc_addClassEventHandler.sqf
+++ b/addons/xeh/fnc_addClassEventHandler.sqf
@@ -44,7 +44,7 @@ _eventName = toLower _eventName;
 
 // no such event
 if (_eventName == "FiredBIS") exitWith {
-    WARNING("Cannot add 'FiredBIS' - Use 'Fired' instead");
+    WARNING("Cannot add ""FiredBIS"" - Use ""Fired"" instead.");
     false
 };
 if !(_eventName in GVAR(EventsLowercase)) exitWith {false};
diff --git a/addons/xeh/fnc_init.sqf b/addons/xeh/fnc_init.sqf
index d20f94de7..5a8184b9c 100644
--- a/addons/xeh/fnc_init.sqf
+++ b/addons/xeh/fnc_init.sqf
@@ -1,4 +1,3 @@
-#define DEBUG_SYNCHRONOUS
 #include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_init
diff --git a/addons/xeh/script_component.hpp b/addons/xeh/script_component.hpp
index 6f6b34376..f024b3e9a 100644
--- a/addons/xeh/script_component.hpp
+++ b/addons/xeh/script_component.hpp
@@ -1,5 +1,4 @@
 #define COMPONENT xeh
-
 #include "\x\cba\addons\main\script_mod.hpp"
 
 //#define DEBUG_ENABLED_XEH