diff --git a/DMRSlot.cpp b/DMRSlot.cpp
index aaf461c..b120336 100644
--- a/DMRSlot.cpp
+++ b/DMRSlot.cpp
@@ -801,13 +801,13 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
 		// - G7RZU
 		unsigned int did = m_netLC->getDstId();
 		if (DstIdBlacklist(did, m_slotNo)) {
-			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG blacklisted) dataType: %s", m_slotNo, did, dataType);
+			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG blacklisted)", m_slotNo, did);
 			return;
 		}
 
 		// true sets allow greater than 4k. Need to add boolean in conf for this later.
 		if (!DstIdWhitelist(did, m_slotNo, true)) {
-			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG not in whitelist) dataType: %s", m_slotNo, did, dataType);
+			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG not in whitelist)", m_slotNo, did);
 			return;
 		}
 
@@ -873,13 +873,13 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
 		// - G7RZU
 		unsigned int did = m_netLC->getDstId();
 		if (DstIdBlacklist(did, m_slotNo)) {
-			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG blacklisted) dataType: %s", m_slotNo, did, dataType);
+			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG blacklisted)", m_slotNo, did);
 			return;
 		}
 
 		// true sets allow greater than 4k. Need to add boolean in conf for this later.
 		if (!DstIdWhitelist(did, m_slotNo, true)) {
-			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG not in whitelist) dataType: %s", m_slotNo, did, dataType);
+			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG not in whitelist)", m_slotNo, did);
 			return;
 		}
 	
@@ -914,14 +914,14 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
 		// - G7RZU
 		unsigned int did = m_netLC->getDstId();
 		if (DstIdBlacklist(did, m_slotNo)) {
-			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG blacklisted) dataType: %s", m_slotNo, did, dataType);
+			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG blacklisted)", m_slotNo, did);
 			writeEndNet();
 			return;
 		}
 
 		// true sets allow greater than 4k. Need to add boolean in conf for this later.
 		if (!DstIdWhitelist(did, m_slotNo, true)) {
-			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG not in whitelist) dataType: %s", m_slotNo, did, dataType);
+			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG not in whitelist)", m_slotNo, did);
 			writeEndNet();
 			return;
 		}
@@ -983,13 +983,13 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
 		// - G7RZU
 		unsigned int did = dataHeader.getDstId();
 		if (DstIdBlacklist(did, m_slotNo)) {
-			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG blacklisted) dataType: %s", m_slotNo, did, dataType);
+			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG blacklisted)", m_slotNo, did);
 			return;
 		}
 
 		// true sets allow greater than 4k. Need to add boolean in conf for this later.
 		if (!DstIdWhitelist(did, m_slotNo, true)) {
-			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG not in whitelist) dataType: %s", m_slotNo, did, dataType);
+			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG not in whitelist)", m_slotNo, did);
 			return;
 		}
 
@@ -1037,13 +1037,13 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
 			// - G7RZU
 			unsigned int did = dmrData.getDstId();
 			if (DstIdBlacklist(did, m_slotNo)) {
-				LogMessage("DMR Slot %u, invalid traffic to TG%u (TG blacklisted) dataType: %s", m_slotNo, did, dataType);
+				LogMessage("DMR Slot %u, invalid traffic to TG%u (TG blacklisted)", m_slotNo, did);
 				return;
 			}
 
 			// true sets allow greater than 4k. Need to add boolean in conf for this later.
 			if (!DstIdWhitelist(did, m_slotNo, true)) {
-				LogMessage("DMR Slot %u, invalid traffic to TG%u (TG not in whitelist) dataType: %s", m_slotNo, did, dataType);
+				LogMessage("DMR Slot %u, invalid traffic to TG%u (TG not in whitelist)", m_slotNo, did);
 				return;
 			}
 
@@ -1144,13 +1144,13 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
 		// - G7RZU
 		unsigned int did = m_netLC->getDstId();
 		if (DstIdBlacklist(did, m_slotNo)) {
-			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG blacklisted) dataType: %s", m_slotNo, did, dataType);
+			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG blacklisted)", m_slotNo, did);
 			return;
 		}
 
 		// true sets allow greater than 4k. Need to add boolean in conf for this later.
 		if (!DstIdWhitelist(did, m_slotNo, true)) {
-			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG not in whitelist) dataType: %s", m_slotNo, did, dataType);
+			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG not in whitelist)", m_slotNo, did);
 			return;
 		}
 
@@ -1215,13 +1215,13 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
 		// - G7RZU
 		unsigned int did = dstId;
 		if (DstIdBlacklist(did, m_slotNo)) {
-			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG blacklisted) dataType: %s", m_slotNo, did, dataType);
+			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG blacklisted)", m_slotNo, did);
 			return;
 		}
 
 		// true sets allow greater than 4k. Need to add boolean in conf for this later.
 		if (!DstIdWhitelist(did, m_slotNo, true)) {
-			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG not in whitelist) dataType: %s", m_slotNo, did, dataType);
+			LogMessage("DMR Slot %u, invalid traffic to TG%u (TG not in whitelist)", m_slotNo, did);
 			return;
 		}
 
@@ -1516,11 +1516,12 @@ bool CDMRSlot::DstIdWhitelist(unsigned int did, unsigned int slot, bool gt4k)
 			return true;
 
 		// No reflectors on slot1, so we only allow all IDs over 99999 unless specifically whitelisted.
+		//Allow traffic to TG0 as I think this is a special case - need to confirm
 		if (gt4k) {
-			if (std::find(m_dstWhiteListSlot1.begin(), m_dstWhiteListSlot1.end(), did) != m_dstWhiteListSlot1.end() || did >= 99999U)
+			if (std::find(m_dstWhiteListSlot1.begin(), m_dstWhiteListSlot1.end(), did) != m_dstWhiteListSlot1.end() || did >= 99999U || did == 0)
 				return true;
 		} else {
-			if (std::find(m_dstWhiteListSlot1.begin(), m_dstWhiteListSlot1.end(), did) != m_dstWhiteListSlot1.end())
+			if (std::find(m_dstWhiteListSlot1.begin(), m_dstWhiteListSlot1.end(), did) != m_dstWhiteListSlot1.end() || did == 0)
 				return true;
 		}
 	} else {
diff --git a/HD44780.cpp b/HD44780.cpp
index 0e1d52c..9c9593f 100644
--- a/HD44780.cpp
+++ b/HD44780.cpp
@@ -753,7 +753,7 @@ void CHD44780::clockInt(unsigned int ms)
 				Time = localtime(&currentTime);
 			}
 			
-			setlocale(LC_ALL,"");
+			setlocale(LC_TIME,"");
 			strftime(m_buffer1, 128, "%X", Time);  // Time
 			strftime(m_buffer2, 128, "%x", Time);  // Date
 
diff --git a/Nextion.cpp b/Nextion.cpp
index 4d74c38..3a36803 100644
--- a/Nextion.cpp
+++ b/Nextion.cpp
@@ -246,7 +246,7 @@ void CNextion::clockInt(unsigned int ms)
 		else
 			Time = ::localtime(&currentTime);
 
-		setlocale(LC_ALL,"");
+		setlocale(LC_TIME,"");
 		char text[50U];
 		strftime(text, 50, "t2.txt=\"%x %X\"", Time);
 		sendCommand(text);