diff --git a/M17Control.cpp b/M17Control.cpp
index 59ef2de..0eda4f6 100644
--- a/M17Control.cpp
+++ b/M17Control.cpp
@@ -234,6 +234,8 @@ bool CM17Control::writeModem(unsigned char* data, unsigned int len)
 
 				writeQueueRF(data);
 			}
+
+			return true;
 		} else {
 			m_rfState = RS_RF_LATE_ENTRY;
 		}
@@ -396,10 +398,6 @@ bool CM17Control::writeModem(unsigned char* data, unsigned int len)
 		// Add the Convolution FEC
 		conv.encodeData(frame, rfData + 2U + M17_SYNC_LENGTH_BYTES + M17_LICH_FRAGMENT_FEC_LENGTH_BYTES);
 
-		unsigned char temp[M17_FRAME_LENGTH_BYTES];
-		interleaver(rfData + 2U, temp);
-		decorrelator(rfData, data + 2U);
-
 		// Calculate the BER
 		if (valid) {
 			for (unsigned int i = 2U; i < (M17_FRAME_LENGTH_BYTES + 2U); i++)
@@ -411,6 +409,10 @@ bool CM17Control::writeModem(unsigned char* data, unsigned int len)
 			m_display->writeM17BER(ber);
 		}
 
+		unsigned char temp[M17_FRAME_LENGTH_BYTES];
+		interleaver(rfData + 2U, temp);
+		decorrelator(rfData, data + 2U);
+
 		if (m_duplex)
 			writeQueueRF(rfData);
 
@@ -419,7 +421,7 @@ bool CM17Control::writeModem(unsigned char* data, unsigned int len)
 		m_rfLICH.getNetwork(netData + 0U);
 
 		// Copy the FN and payload from the frame
-		::memcpy(netData + M17_LICH_LENGTH_BYTES, frame, M17_FN_LENGTH_BYTES + M17_PAYLOAD_LENGTH_BYTES);
+		::memcpy(netData + M17_LICH_LENGTH_BYTES - M17_CRC_LENGTH_BYTES, frame, M17_FN_LENGTH_BYTES + M17_PAYLOAD_LENGTH_BYTES);
 
 		// The CRC is added in the networking code
 
@@ -572,7 +574,7 @@ void CM17Control::writeNetwork()
 	m_netFrames++;
 
 	// Add the fragment LICH
-	uint16_t fn = (netData[38U] << 8) + (netData[39U] << 0);
+	uint16_t fn = (netData[28U] << 8) + (netData[29U] << 0);
 
 	unsigned char lich[M17_LICH_FRAGMENT_LENGTH_BYTES];
 	m_netLICH.getFragment(lich, fn);
@@ -590,7 +592,7 @@ void CM17Control::writeNetwork()
 
 	// Add the FN and the data/audio
 	unsigned char payload[M17_FN_LENGTH_BYTES + M17_PAYLOAD_LENGTH_BYTES + M17_CRC_LENGTH_BYTES];
-	::memcpy(payload, netData + 38U, M17_FN_LENGTH_BYTES + M17_PAYLOAD_LENGTH_BYTES);
+	::memcpy(payload, netData + 28U, M17_FN_LENGTH_BYTES + M17_PAYLOAD_LENGTH_BYTES);
 
 	// Add the CRC
 	CM17CRC::encodeCRC(payload, M17_FN_LENGTH_BYTES + M17_PAYLOAD_LENGTH_BYTES + M17_CRC_LENGTH_BYTES);
diff --git a/M17Convolution.cpp b/M17Convolution.cpp
index a3d06ba..1f64a76 100644
--- a/M17Convolution.cpp
+++ b/M17Convolution.cpp
@@ -124,7 +124,7 @@ void CM17Convolution::decodeLinkSetup(const unsigned char* in, unsigned char* ou
 	assert(in != NULL);
 	assert(out != NULL);
 
-	uint8_t temp[488U];
+	uint8_t temp[500U];
 
 	unsigned int n = 0U;
 	unsigned int index = 0U;
@@ -151,7 +151,7 @@ void CM17Convolution::decodeLinkSetup(const unsigned char* in, unsigned char* ou
 		decode(s0, s1);
 	}
 
-	chainback(out, 244U);
+	chainback(out, 240U);
 }
 
 void CM17Convolution::decodeData(const unsigned char* in, unsigned char* out)
@@ -159,7 +159,7 @@ void CM17Convolution::decodeData(const unsigned char* in, unsigned char* out)
 	assert(in != NULL);
 	assert(out != NULL);
 
-	uint8_t temp[328U];
+	uint8_t temp[350U];
 
 	unsigned int n = 0U;
 	unsigned int index = 0U;
@@ -186,7 +186,7 @@ void CM17Convolution::decodeData(const unsigned char* in, unsigned char* out)
 		decode(s0, s1);
 	}
 
-	chainback(out, 164U);
+	chainback(out, 160U);
 }
 
 void CM17Convolution::start()
diff --git a/M17LICH.cpp b/M17LICH.cpp
index 2de383e..ed2b870 100644
--- a/M17LICH.cpp
+++ b/M17LICH.cpp
@@ -80,13 +80,13 @@ void CM17LICH::setDest(const std::string& callsign)
 
 unsigned char CM17LICH::getDataType() const
 {
-	return (m_lich[12U] >> 1) & 0x03U;
+	return (m_lich[13U] >> 1) & 0x03U;
 }
 
 void CM17LICH::setDataType(unsigned char type)
 {
-	m_lich[12U] &= 0xF9U;
-	m_lich[12U] |= (type << 1) & 0x06U;
+	m_lich[13U] &= 0xF9U;
+	m_lich[13U] |= (type << 1) & 0x06U;
 }
 
 void CM17LICH::reset()
diff --git a/M17Network.cpp b/M17Network.cpp
index b020dfa..281413e 100644
--- a/M17Network.cpp
+++ b/M17Network.cpp
@@ -222,7 +222,7 @@ void CM17Network::clock(unsigned int ms)
 	unsigned char c = length - 6U;
 	m_buffer.addData(&c, 1U);
 
-	m_buffer.addData(buffer + 6U, length - 6U);
+	m_buffer.addData(buffer + 6U, length - 8U);
 }
 
 bool CM17Network::read(unsigned char* data)