diff --git a/p25/DataPacket.cpp b/p25/DataPacket.cpp
index 6e433592..7c6da2e8 100644
--- a/p25/DataPacket.cpp
+++ b/p25/DataPacket.cpp
@@ -696,7 +696,7 @@ void DataPacket::writeRF_PDU_Reg_Response(uint8_t regType, uint32_t llId, ulong6
     if ((regType != PDU_REG_TYPE_RSP_ACCPT) && (regType != PDU_REG_TYPE_RSP_DENY))
         return;
 
-    uint32_t bitLength = (2U * P25_PDU_FEC_LENGTH_BITS) + P25_PREAMBLE_LENGTH_BITS;
+    uint32_t bitLength = (2U * P25_PDU_FEC_LENGTH_BITS); // + P25_PREAMBLE_LENGTH_BITS;
     uint32_t offset = P25_PREAMBLE_LENGTH_BITS;
 
     uint8_t buffer[P25_PDU_FEC_LENGTH_BYTES];
@@ -753,18 +753,18 @@ void DataPacket::writeRF_PDU_Reg_Response(uint8_t regType, uint32_t llId, ulong6
 
     uint8_t pdu[P25_MAX_PDU_COUNT * P25_LDU_FRAME_LENGTH_BYTES + 2U];
 
-    // Add the data
-    uint32_t newBitLength = P25Utils::encode(m_rfPDU, pdu + 2U, bitLength);
-    uint32_t newByteLength = newBitLength / 8U;
-    if ((newBitLength % 8U) > 0U)
-        newByteLength++;
-
     // Regenerate Sync
     Sync::addP25Sync(pdu + 2U);
 
     // Regenerate NID
     m_p25->m_nid.encode(pdu + 2U, P25_DUID_PDU);
 
+    // Add the data
+    uint32_t newBitLength = P25Utils::encode(m_rfPDU, pdu + 2U, 114U, bitLength);
+    uint32_t newByteLength = newBitLength / 8U;
+    if ((newBitLength % 8U) > 0U)
+        newByteLength++;
+
     // Add busy bits
     m_p25->addBusyBits(pdu + 2U, newBitLength, false, true);
 
@@ -788,7 +788,7 @@ void DataPacket::writeRF_PDU_Ack_Response(uint8_t ackClass, uint8_t ackType, uin
     if (ackClass == PDU_ACK_CLASS_ACK && ackType != PDU_ACK_TYPE_ACK)
         return;
 
-    uint32_t bitLength = (2U * P25_PDU_FEC_LENGTH_BITS) + P25_PREAMBLE_LENGTH_BITS;
+    uint32_t bitLength = (2U * P25_PDU_FEC_LENGTH_BITS); // + P25_PREAMBLE_LENGTH_BITS;
     uint32_t offset = P25_PREAMBLE_LENGTH_BITS;
 
     uint8_t buffer[P25_PDU_FEC_LENGTH_BYTES];
@@ -812,18 +812,18 @@ void DataPacket::writeRF_PDU_Ack_Response(uint8_t ackClass, uint8_t ackType, uin
 
     uint8_t pdu[P25_MAX_PDU_COUNT * P25_LDU_FRAME_LENGTH_BYTES + 2U];
 
-    // Add the data
-    uint32_t newBitLength = P25Utils::encode(m_rfPDU, pdu + 2U, bitLength);
-    uint32_t newByteLength = newBitLength / 8U;
-    if ((newBitLength % 8U) > 0U)
-        newByteLength++;
-
     // Regenerate Sync
     Sync::addP25Sync(pdu + 2U);
 
     // Regenerate NID
     m_p25->m_nid.encode(pdu + 2U, P25_DUID_PDU);
 
+    // Add the data
+    uint32_t newBitLength = P25Utils::encode(m_rfPDU, pdu + 2U, 114U, bitLength);
+    uint32_t newByteLength = newBitLength / 8U;
+    if ((newBitLength % 8U) > 0U)
+        newByteLength++;
+
     // Add busy bits
     m_p25->addBusyBits(pdu + 2U, newBitLength, false, true);
 
diff --git a/p25/data/DataRspHeader.cpp b/p25/data/DataRspHeader.cpp
index 5f9980f2..bac1e79d 100644
--- a/p25/data/DataRspHeader.cpp
+++ b/p25/data/DataRspHeader.cpp
@@ -112,7 +112,7 @@ bool DataRspHeader::decode(const uint8_t* data)
 /// Encodes P25 PDU data response header.
 /// </summary>
 /// <param name="data"></param>
-void DataRspHeader::encode(uint8_t * data)
+void DataRspHeader::encode(uint8_t* data)
 {
     assert(data != NULL);
 
@@ -144,7 +144,7 @@ void DataRspHeader::encode(uint8_t * data)
     edac::CRC::addCCITT162(header, P25_PDU_HEADER_LENGTH_BYTES);
 
 #if DEBUG_P25_PDU_DATA
-    Utils::dump(1U, "P25, DataRspHeader::encode(), PDU Response Header Data", data, P25_PDU_HEADER_LENGTH_BYTES);
+    Utils::dump(1U, "P25, DataRspHeader::encode(), PDU Response Header Data", header, P25_PDU_HEADER_LENGTH_BYTES);
 #endif
 
     // encode 1/2 rate Trellis