diff --git a/Modules/Messenger.lua b/Modules/Messenger.lua
index d1705f8..373c8fe 100644
--- a/Modules/Messenger.lua
+++ b/Modules/Messenger.lua
@@ -35,21 +35,21 @@ function shared.Messenger.Init()
 	if not shared.messenger.queue then shared.messenger.queue = {} end
 	if not shared.messenger.ticker then
 		local function DoMessage()
-			if Heimdall_Data.config.messenger.debug then
-				print(string.format("[%s] Processing message queue", ModuleName))
-			end
+			--if Heimdall_Data.config.messenger.debug then
+			--	print(string.format("[%s] Processing message queue", ModuleName))
+			--end
 			if not Heimdall_Data.config.messenger.enabled then
-				if Heimdall_Data.config.messenger.debug then
-					print(string.format("[%s] Module disabled, skipping message processing", ModuleName))
-				end
+				--if Heimdall_Data.config.messenger.debug then
+				--	print(string.format("[%s] Module disabled, skipping message processing", ModuleName))
+				--end
 				return
 			end
 			---@type Message
 			local message = shared.messenger.queue[1]
 			if not message then
-				if Heimdall_Data.config.messenger.debug then
-					print(string.format("[%s] Message queue empty", ModuleName))
-				end
+				--if Heimdall_Data.config.messenger.debug then
+				--	print(string.format("[%s] Message queue empty", ModuleName))
+				--end
 				return
 			end
 			if not message.message or message.message == "" then
@@ -111,13 +111,16 @@ function shared.Messenger.Init()
 				print(string.format("[%s] Message too long!!!!: %s", ModuleName, message.message))
 				return
 			end
+			if string.find(message.channel, "^C") then
+				message.channel = "CHANNEL"
+			end
 			SendChatMessage(message.message, message.channel, nil, message.data)
 		end
 		local function Tick()
-			if Heimdall_Data.config.messenger.debug then
-				local queueSize = #shared.messenger.queue
-				print(string.format("[%s] Queue check - Messages pending: %d", ModuleName, queueSize))
-			end
+			--if Heimdall_Data.config.messenger.debug then
+			--	local queueSize = #shared.messenger.queue
+			--	print(string.format("[%s] Queue check - Messages pending: %d", ModuleName, queueSize))
+			--end
 			DoMessage()
 			shared.messenger.ticker = C_Timer.NewTimer(Heimdall_Data.config.messenger.interval, Tick, 1)
 		end
diff --git a/Modules/NetworkMessenger.lua b/Modules/NetworkMessenger.lua
index 6a40427..a13113d 100644
--- a/Modules/NetworkMessenger.lua
+++ b/Modules/NetworkMessenger.lua
@@ -12,21 +12,21 @@ function shared.NetworkMessenger.Init()
 	if not shared.networkMessenger.queue then shared.networkMessenger.queue = {} end
 	if not shared.networkMessenger.ticker then
 		local function DoMessage()
-			if Heimdall_Data.config.networkMessenger.debug then
-				print(string.format("[%s] Processing network message queue", ModuleName))
-			end
+			--if Heimdall_Data.config.networkMessenger.debug then
+			--	print(string.format("[%s] Processing network message queue", ModuleName))
+			--end
 			if not Heimdall_Data.config.networkMessenger.enabled then
-				if Heimdall_Data.config.networkMessenger.debug then
-					print(string.format("[%s] Module disabled, skipping network message processing", ModuleName))
-				end
+				--if Heimdall_Data.config.networkMessenger.debug then
+				--	print(string.format("[%s] Module disabled, skipping network message processing", ModuleName))
+				--end
 				return
 			end
 			---@type Message
 			local message = shared.networkMessenger.queue[1]
 			if not message then
-				if Heimdall_Data.config.networkMessenger.debug then
-					print(string.format("[%s] Network message queue empty", ModuleName))
-				end
+				--if Heimdall_Data.config.networkMessenger.debug then
+				--	print(string.format("[%s] Network message queue empty", ModuleName))
+				--end
 				return
 			end
 			if not message.message or message.message == "" then
@@ -71,7 +71,7 @@ function shared.NetworkMessenger.Init()
 			if Heimdall_Data.config.networkMessenger.debug then
 				print(string.format("[%s] Payload: %s", ModuleName, payload))
 			end
-			if #shared.networkNodes == 0 then
+			if not shared.networkNodes or #shared.networkNodes == 0 then
 				if Heimdall_Data.config.networkMessenger.debug then
 					print(string.format("[%s] No network nodes found, wtf????", ModuleName))
 				end
@@ -81,10 +81,10 @@ function shared.NetworkMessenger.Init()
 			SendAddonMessage(Heimdall_Data.config.addonPrefix, payload, "WHISPER", target)
 		end
 		local function Tick()
-			if Heimdall_Data.config.networkMessenger.debug then
-				local queueSize = #shared.networkMessenger.queue
-				print(string.format("[%s] Queue check - Network messages pending: %d", ModuleName, queueSize))
-			end
+			--if Heimdall_Data.config.networkMessenger.debug then
+			--	local queueSize = #shared.networkMessenger.queue
+			--	print(string.format("[%s] Queue check - Network messages pending: %d", ModuleName, queueSize))
+			--end
 			DoMessage()
 			shared.networkMessenger.ticker = C_Timer.NewTimer(Heimdall_Data.config.networkMessenger.interval, Tick, 1)
 		end