diff --git a/NXDNControl.cpp b/NXDNControl.cpp
index 7d53c74..552f46f 100644
--- a/NXDNControl.cpp
+++ b/NXDNControl.cpp
@@ -210,6 +210,8 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
 			return false;
 		}
 
+		m_rfLayer3 = layer3;
+
 		data[0U] = type == NXDN_MESSAGE_TYPE_TX_REL ? TAG_EOT : TAG_DATA;
 		data[1U] = 0x00U;
 
@@ -258,8 +260,6 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
 #if defined(DUMP_NXDN)
 			openFile();
 #endif
-			m_rfLayer3 = layer3;
-
 			unsigned short srcId = m_rfLayer3.getSourceUnitId();
 			unsigned short dstId = m_rfLayer3.getDestinationGroupId();
 			bool grp             = m_rfLayer3.getIsGroup();
diff --git a/NXDNNetwork.cpp b/NXDNNetwork.cpp
index 53cfb05..16beec7 100644
--- a/NXDNNetwork.cpp
+++ b/NXDNNetwork.cpp
@@ -72,14 +72,14 @@ bool CNXDNNetwork::write(const unsigned char* data, unsigned short src, bool grp
 	buffer[4U] = 'D';
 
 	buffer[5U] = (src >> 8) & 0xFFU;
-	buffer[6U] = (src >> 8) & 0xFFU;
+	buffer[6U] = (src >> 0) & 0xFFU;
 
 	buffer[7U]  = grp ? 0x01U : 0x00U;
 	buffer[7U] |= dat ? 0x02U : 0x00U;
 	buffer[7U] |= end ? 0x04U : 0x00U;
 
 	buffer[8U] = (dst >> 8) & 0xFFU;
-	buffer[9U] = (dst >> 8) & 0xFFU;
+	buffer[9U] = (dst >> 0) & 0xFFU;
 
 	buffer[10U] = cnt;
 
diff --git a/UDPSocket.cpp b/UDPSocket.cpp
index 396f1f7..ba0e35f 100644
--- a/UDPSocket.cpp
+++ b/UDPSocket.cpp
@@ -32,8 +32,6 @@ m_address(address),
 m_port(port),
 m_fd(-1)
 {
-	assert(!address.empty());
-
 #if defined(_WIN32) || defined(_WIN64)
 	WSAData data;
 	int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data);