diff --git a/src/p25/lc/AMBT.cpp b/src/p25/lc/AMBT.cpp
index 0a7d4c75..12fac0a0 100644
--- a/src/p25/lc/AMBT.cpp
+++ b/src/p25/lc/AMBT.cpp
@@ -85,7 +85,7 @@ void AMBT::encode(uint8_t* data, bool rawTSBK, bool noTrellis)
 /// </summary>
 /// <param name="tsbk"></param>
 /// <returns></returns>
-ulong64_t AMBT::toValue(const data::DataHeader dataHeader, const uint8_t* pduUserData)
+ulong64_t AMBT::toValue(const data::DataHeader& dataHeader, const uint8_t* pduUserData)
 {
     ulong64_t tsbkValue = 0U;
 
@@ -109,7 +109,7 @@ ulong64_t AMBT::toValue(const data::DataHeader dataHeader, const uint8_t* pduUse
 /// <param name="blocks"></param>
 /// <param name="pduUserData"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool AMBT::decode(const data::DataHeader dataHeader, const data::DataBlock* blocks, uint8_t* pduUserData)
+bool AMBT::decode(const data::DataHeader& dataHeader, const data::DataBlock* blocks, uint8_t* pduUserData)
 {
     assert(blocks != nullptr);
     assert(pduUserData != nullptr);
diff --git a/src/p25/lc/AMBT.h b/src/p25/lc/AMBT.h
index b0aaea4c..e54e2c46 100644
--- a/src/p25/lc/AMBT.h
+++ b/src/p25/lc/AMBT.h
@@ -46,7 +46,7 @@ namespace p25
             AMBT();
 
             /// <summary>Decode a alternate trunking signalling block.</summary>
-            virtual bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks) = 0;
+            virtual bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks) = 0;
             /// <summary>Encode a alternate trunking signalling block.</summary>
             virtual void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData) = 0;
 
@@ -57,10 +57,10 @@ namespace p25
 
         protected:
             /// <summary>Internal helper to convert TSBK bytes to a 64-bit long value.</summary>
-            static ulong64_t toValue(const data::DataHeader dataHeader, const uint8_t* pduUserData);
+            static ulong64_t toValue(const data::DataHeader& dataHeader, const uint8_t* pduUserData);
 
             /// <summary>Internal helper to decode a trunking signalling block.</summary>
-            bool decode(const data::DataHeader dataHeader, const data::DataBlock* blocks, uint8_t* pduUserData);
+            bool decode(const data::DataHeader& dataHeader, const data::DataBlock* blocks, uint8_t* pduUserData);
             /// <summary>Internal helper to encode a trunking signalling block.</summary>
             void encode(data::DataHeader& dataHeader, uint8_t* pduUserData);
         };
diff --git a/src/p25/lc/tsbk/MBT_IOSP_ACK_RSP.cpp b/src/p25/lc/tsbk/MBT_IOSP_ACK_RSP.cpp
index 9f41b678..984ab5ff 100644
--- a/src/p25/lc/tsbk/MBT_IOSP_ACK_RSP.cpp
+++ b/src/p25/lc/tsbk/MBT_IOSP_ACK_RSP.cpp
@@ -53,7 +53,7 @@ MBT_IOSP_ACK_RSP::MBT_IOSP_ACK_RSP() : AMBT()
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_IOSP_ACK_RSP::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_IOSP_ACK_RSP::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 
diff --git a/src/p25/lc/tsbk/MBT_IOSP_ACK_RSP.h b/src/p25/lc/tsbk/MBT_IOSP_ACK_RSP.h
index 20832f17..3e49a0a1 100644
--- a/src/p25/lc/tsbk/MBT_IOSP_ACK_RSP.h
+++ b/src/p25/lc/tsbk/MBT_IOSP_ACK_RSP.h
@@ -47,7 +47,7 @@ namespace p25
                 MBT_IOSP_ACK_RSP();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 
diff --git a/src/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.cpp b/src/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.cpp
index 276521f8..d5a8172d 100644
--- a/src/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.cpp
+++ b/src/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.cpp
@@ -53,7 +53,7 @@ MBT_IOSP_CALL_ALRT::MBT_IOSP_CALL_ALRT() : AMBT()
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_IOSP_CALL_ALRT::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_IOSP_CALL_ALRT::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 
diff --git a/src/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.h b/src/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.h
index 974998e6..6b281950 100644
--- a/src/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.h
+++ b/src/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.h
@@ -47,7 +47,7 @@ namespace p25
                 MBT_IOSP_CALL_ALRT();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 
diff --git a/src/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.cpp b/src/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.cpp
index b7ebd006..3f8b22a6 100644
--- a/src/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.cpp
+++ b/src/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.cpp
@@ -54,7 +54,7 @@ MBT_IOSP_EXT_FNCT::MBT_IOSP_EXT_FNCT() : AMBT(),
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_IOSP_EXT_FNCT::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_IOSP_EXT_FNCT::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 
diff --git a/src/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.h b/src/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.h
index b76a6bda..c144c37a 100644
--- a/src/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.h
+++ b/src/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.h
@@ -47,7 +47,7 @@ namespace p25
                 MBT_IOSP_EXT_FNCT();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 
diff --git a/src/p25/lc/tsbk/MBT_IOSP_GRP_AFF.cpp b/src/p25/lc/tsbk/MBT_IOSP_GRP_AFF.cpp
index e32893ba..118fd2c7 100644
--- a/src/p25/lc/tsbk/MBT_IOSP_GRP_AFF.cpp
+++ b/src/p25/lc/tsbk/MBT_IOSP_GRP_AFF.cpp
@@ -53,7 +53,7 @@ MBT_IOSP_GRP_AFF::MBT_IOSP_GRP_AFF() : AMBT()
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_IOSP_GRP_AFF::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_IOSP_GRP_AFF::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 
diff --git a/src/p25/lc/tsbk/MBT_IOSP_GRP_AFF.h b/src/p25/lc/tsbk/MBT_IOSP_GRP_AFF.h
index 4fa513e1..640a828f 100644
--- a/src/p25/lc/tsbk/MBT_IOSP_GRP_AFF.h
+++ b/src/p25/lc/tsbk/MBT_IOSP_GRP_AFF.h
@@ -47,7 +47,7 @@ namespace p25
                 MBT_IOSP_GRP_AFF();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 
diff --git a/src/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.cpp b/src/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.cpp
index 5b6396ae..1872f446 100644
--- a/src/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.cpp
+++ b/src/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.cpp
@@ -54,7 +54,7 @@ MBT_IOSP_MSG_UPDT::MBT_IOSP_MSG_UPDT() : AMBT(),
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_IOSP_MSG_UPDT::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_IOSP_MSG_UPDT::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 
diff --git a/src/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.h b/src/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.h
index 838837ff..afae7e39 100644
--- a/src/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.h
+++ b/src/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.h
@@ -47,7 +47,7 @@ namespace p25
                 MBT_IOSP_MSG_UPDT();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 
diff --git a/src/p25/lc/tsbk/MBT_IOSP_STS_UPDT.cpp b/src/p25/lc/tsbk/MBT_IOSP_STS_UPDT.cpp
index 30c4f9d6..1cf1f318 100644
--- a/src/p25/lc/tsbk/MBT_IOSP_STS_UPDT.cpp
+++ b/src/p25/lc/tsbk/MBT_IOSP_STS_UPDT.cpp
@@ -54,7 +54,7 @@ MBT_IOSP_STS_UPDT::MBT_IOSP_STS_UPDT() : AMBT(),
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_IOSP_STS_UPDT::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_IOSP_STS_UPDT::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 
diff --git a/src/p25/lc/tsbk/MBT_IOSP_STS_UPDT.h b/src/p25/lc/tsbk/MBT_IOSP_STS_UPDT.h
index 561fac52..1abe5b84 100644
--- a/src/p25/lc/tsbk/MBT_IOSP_STS_UPDT.h
+++ b/src/p25/lc/tsbk/MBT_IOSP_STS_UPDT.h
@@ -47,7 +47,7 @@ namespace p25
                 MBT_IOSP_STS_UPDT();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 
diff --git a/src/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.cpp b/src/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.cpp
index 443c6141..0b5c23b5 100644
--- a/src/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.cpp
+++ b/src/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.cpp
@@ -74,7 +74,7 @@ MBT_ISP_AUTH_RESP_M::~MBT_ISP_AUTH_RESP_M()
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_ISP_AUTH_RESP_M::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_ISP_AUTH_RESP_M::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 
diff --git a/src/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.h b/src/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.h
index d0af35e4..9b6551a8 100644
--- a/src/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.h
+++ b/src/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.h
@@ -48,7 +48,7 @@ namespace p25
                 ~MBT_ISP_AUTH_RESP_M();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 
diff --git a/src/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.cpp b/src/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.cpp
index daafd754..456d878f 100644
--- a/src/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.cpp
+++ b/src/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.cpp
@@ -53,7 +53,7 @@ MBT_ISP_AUTH_SU_DMD::MBT_ISP_AUTH_SU_DMD() : AMBT()
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_ISP_AUTH_SU_DMD::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_ISP_AUTH_SU_DMD::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 
diff --git a/src/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.h b/src/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.h
index dfdf26a4..7b9e756c 100644
--- a/src/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.h
+++ b/src/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.h
@@ -46,7 +46,7 @@ namespace p25
                 MBT_ISP_AUTH_SU_DMD();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 
diff --git a/src/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.cpp b/src/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.cpp
index d0ec8407..41c4cce5 100644
--- a/src/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.cpp
+++ b/src/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.cpp
@@ -53,7 +53,7 @@ MBT_ISP_CAN_SRV_REQ::MBT_ISP_CAN_SRV_REQ() : AMBT()
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_ISP_CAN_SRV_REQ::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_ISP_CAN_SRV_REQ::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 
diff --git a/src/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.h b/src/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.h
index 6573bc6a..231130dd 100644
--- a/src/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.h
+++ b/src/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.h
@@ -46,7 +46,7 @@ namespace p25
                 MBT_ISP_CAN_SRV_REQ();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 
diff --git a/src/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.cpp b/src/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.cpp
index 288c9417..b97b9027 100644
--- a/src/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.cpp
+++ b/src/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.cpp
@@ -59,7 +59,7 @@ MBT_OSP_ADJ_STS_BCAST::MBT_OSP_ADJ_STS_BCAST() : AMBT(),
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_OSP_ADJ_STS_BCAST::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_OSP_ADJ_STS_BCAST::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 
diff --git a/src/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.h b/src/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.h
index 858147de..e3efdfa2 100644
--- a/src/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.h
+++ b/src/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.h
@@ -46,7 +46,7 @@ namespace p25
                 MBT_OSP_ADJ_STS_BCAST();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 
diff --git a/src/p25/lc/tsbk/MBT_OSP_AUTH_DMD.cpp b/src/p25/lc/tsbk/MBT_OSP_AUTH_DMD.cpp
index 0157b707..62e9aa54 100644
--- a/src/p25/lc/tsbk/MBT_OSP_AUTH_DMD.cpp
+++ b/src/p25/lc/tsbk/MBT_OSP_AUTH_DMD.cpp
@@ -74,7 +74,7 @@ MBT_OSP_AUTH_DMD::~MBT_OSP_AUTH_DMD()
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_OSP_AUTH_DMD::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_OSP_AUTH_DMD::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 
diff --git a/src/p25/lc/tsbk/MBT_OSP_AUTH_DMD.h b/src/p25/lc/tsbk/MBT_OSP_AUTH_DMD.h
index 0132eaf7..7e8e0fcd 100644
--- a/src/p25/lc/tsbk/MBT_OSP_AUTH_DMD.h
+++ b/src/p25/lc/tsbk/MBT_OSP_AUTH_DMD.h
@@ -48,7 +48,7 @@ namespace p25
                 ~MBT_OSP_AUTH_DMD();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 
diff --git a/src/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.cpp b/src/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.cpp
index 37c86c2c..77246ad0 100644
--- a/src/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.cpp
+++ b/src/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.cpp
@@ -53,7 +53,7 @@ MBT_OSP_NET_STS_BCAST::MBT_OSP_NET_STS_BCAST() : AMBT()
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_OSP_NET_STS_BCAST::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_OSP_NET_STS_BCAST::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 
diff --git a/src/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.h b/src/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.h
index 079518a9..d250313c 100644
--- a/src/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.h
+++ b/src/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.h
@@ -46,7 +46,7 @@ namespace p25
                 MBT_OSP_NET_STS_BCAST();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 
diff --git a/src/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.cpp b/src/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.cpp
index 3c8f07ee..fb6cc2ad 100644
--- a/src/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.cpp
+++ b/src/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.cpp
@@ -53,7 +53,7 @@ MBT_OSP_RFSS_STS_BCAST::MBT_OSP_RFSS_STS_BCAST() : AMBT()
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_OSP_RFSS_STS_BCAST::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_OSP_RFSS_STS_BCAST::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 
diff --git a/src/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.h b/src/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.h
index e95fc193..d1af71d7 100644
--- a/src/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.h
+++ b/src/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.h
@@ -46,7 +46,7 @@ namespace p25
                 MBT_OSP_RFSS_STS_BCAST();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 
diff --git a/src/p25/lc/tsbk/TSBKFactory.cpp b/src/p25/lc/tsbk/TSBKFactory.cpp
index 11e84118..5cb0b38e 100644
--- a/src/p25/lc/tsbk/TSBKFactory.cpp
+++ b/src/p25/lc/tsbk/TSBKFactory.cpp
@@ -247,7 +247,7 @@ std::unique_ptr<TSBK> TSBKFactory::createTSBK(const uint8_t* data, bool rawTSBK)
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns></returns>
-std::unique_ptr<AMBT> TSBKFactory::createAMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+std::unique_ptr<AMBT> TSBKFactory::createAMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != nullptr);
 
@@ -358,7 +358,7 @@ std::unique_ptr<TSBK> TSBKFactory::decode(TSBK* tsbk, const uint8_t* data, bool
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns></returns>
-std::unique_ptr<AMBT> TSBKFactory::decode(AMBT* ambt, const data::DataHeader dataHeader, const data::DataBlock* blocks)
+std::unique_ptr<AMBT> TSBKFactory::decode(AMBT* ambt, const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(ambt != nullptr);
     assert(blocks != nullptr);
diff --git a/src/p25/lc/tsbk/TSBKFactory.h b/src/p25/lc/tsbk/TSBKFactory.h
index dd1da0ef..7aba61f2 100644
--- a/src/p25/lc/tsbk/TSBKFactory.h
+++ b/src/p25/lc/tsbk/TSBKFactory.h
@@ -116,7 +116,7 @@ namespace p25
                 /// <summary>Create an instance of a TSBK.</summary>
                 static std::unique_ptr<TSBK> createTSBK(const uint8_t* data, bool rawTSBK = false);
                 /// <summary>Create an instance of a AMBT.</summary>
-                static std::unique_ptr<AMBT> createAMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                static std::unique_ptr<AMBT> createAMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
 
                 /// <summary>Sets the flag indicating CRC-errors should be warnings and not errors.</summary>
                 static void setWarnCRC(bool warnCRC) { m_warnCRC = warnCRC; }
@@ -127,7 +127,7 @@ namespace p25
                 /// <summary></summary>
                 static std::unique_ptr<TSBK> decode(TSBK* tsbk, const uint8_t* data, bool rawTSBK = false);
                 /// <summary></summary>
-                static std::unique_ptr<AMBT> decode(AMBT* ambt, const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                static std::unique_ptr<AMBT> decode(AMBT* ambt, const data::DataHeader& dataHeader, const data::DataBlock* blocks);
             };
         } // namespace tsbk
     } // namespace lc
diff --git a/src/p25/packet/Data.cpp b/src/p25/packet/Data.cpp
index d2be1c4a..e93e0db3 100644
--- a/src/p25/packet/Data.cpp
+++ b/src/p25/packet/Data.cpp
@@ -679,7 +679,7 @@ bool Data::hasLLIdFNEReg(uint32_t llId) const
 /// <param name="dataHeader"></param>
 /// <param name="pduUserData"></param>
 /// <param name="clearBeforeWrite"></param>
-void Data::writeRF_PDU_User(data::DataHeader dataHeader, const uint8_t* pduUserData, bool clearBeforeWrite)
+void Data::writeRF_PDU_User(data::DataHeader& dataHeader, const uint8_t* pduUserData, bool clearBeforeWrite)
 {
     assert(pduUserData != nullptr);
 
diff --git a/src/p25/packet/Data.h b/src/p25/packet/Data.h
index baaed00a..ff87bfd0 100644
--- a/src/p25/packet/Data.h
+++ b/src/p25/packet/Data.h
@@ -74,7 +74,7 @@ namespace p25
             bool hasLLIdFNEReg(uint32_t llId) const;
 
             /// <summary>Helper to write user data as a P25 PDU packet.</summary>
-            void writeRF_PDU_User(data::DataHeader dataHeader, const uint8_t* pduUserData, bool clearBeforeWrite = false);
+            void writeRF_PDU_User(data::DataHeader& dataHeader, const uint8_t* pduUserData, bool clearBeforeWrite = false);
 
             /// <summary>Updates the processor by the passed number of milliseconds.</summary>
             void clock(uint32_t ms);
diff --git a/src/p25/packet/Trunk.cpp b/src/p25/packet/Trunk.cpp
index fb3c6144..db2d51a1 100644
--- a/src/p25/packet/Trunk.cpp
+++ b/src/p25/packet/Trunk.cpp
@@ -907,7 +907,7 @@ bool Trunk::processNetwork(uint8_t* data, uint32_t len, lc::LC& control, data::L
 /// </summary>
 /// <param name="dataHeader"></param>
 /// <param name="dataBlock"></param>
-bool Trunk::processMBT(DataHeader dataHeader, DataBlock* blocks)
+bool Trunk::processMBT(DataHeader& dataHeader, DataBlock* blocks)
 {
     if (!m_p25->m_control) {
         return false;
diff --git a/src/p25/packet/Trunk.h b/src/p25/packet/Trunk.h
index 6769b479..1ecab020 100644
--- a/src/p25/packet/Trunk.h
+++ b/src/p25/packet/Trunk.h
@@ -67,7 +67,7 @@ namespace p25
             virtual bool processNetwork(uint8_t* data, uint32_t len, lc::LC& control, data::LowSpeedData& lsd, uint8_t& duid);
 
             /// <summary>Helper used to process AMBTs from PDU data.</summary>
-            bool processMBT(data::DataHeader dataHeader, data::DataBlock* blocks);
+            bool processMBT(data::DataHeader& dataHeader, data::DataBlock* blocks);
 
             /// <summary>Helper to write P25 adjacent site information to the network.</summary>
             void writeAdjSSNetwork();