diff --git a/src/common/lookups/AffiliationLookup.cpp b/src/common/lookups/AffiliationLookup.cpp
index e061008b..8e33146a 100644
--- a/src/common/lookups/AffiliationLookup.cpp
+++ b/src/common/lookups/AffiliationLookup.cpp
@@ -210,7 +210,8 @@ bool AffiliationLookup::groupUnaff(uint32_t srcId)
 
     // remove dynamic affiliation table entry
     try {
-        m_grpAffTable.at(srcId);
+        uint32_t entry = m_grpAffTable.at(srcId); // this value will get discarded
+        (void)entry;                              // but some variants of C++ mark the unordered_map<>::at as nodiscard
         m_grpAffTable.erase(srcId);
         return true;
     }
diff --git a/src/common/lookups/PeerListLookup.cpp b/src/common/lookups/PeerListLookup.cpp
index 65c3c40c..013de1d5 100644
--- a/src/common/lookups/PeerListLookup.cpp
+++ b/src/common/lookups/PeerListLookup.cpp
@@ -69,7 +69,8 @@ void PeerListLookup::eraseEntry(uint32_t id)
 {
     std::lock_guard<std::mutex> lock(m_mutex);
     try {
-        m_table.at(id);
+        PeerId entry = m_table.at(id);  // this value will get discarded
+        (void)entry;                    // but some variants of C++ mark the unordered_map<>::at as nodiscard
         m_table.erase(id);
     } catch (...) {
         /* stub */
diff --git a/src/fne/network/callhandler/TagP25Data.cpp b/src/fne/network/callhandler/TagP25Data.cpp
index 63eb6757..329b026e 100644
--- a/src/fne/network/callhandler/TagP25Data.cpp
+++ b/src/fne/network/callhandler/TagP25Data.cpp
@@ -744,7 +744,7 @@ bool TagP25Data::processTSDUTo(uint8_t* buffer, uint32_t peerId, uint8_t duid)
 
         std::unique_ptr<lc::TSBK> tsbk = lc::tsbk::TSBKFactory::createTSBK(data.get());
         if (tsbk != nullptr) {
-            uint32_t srcId = tsbk->getSrcId();
+            //uint32_t srcId = tsbk->getSrcId();
             uint32_t dstId = tsbk->getDstId();
 
             FNEPeerConnection* connection = nullptr;
diff --git a/src/fne/network/callhandler/packetdata/DMRPacketData.cpp b/src/fne/network/callhandler/packetdata/DMRPacketData.cpp
index fc3f94e1..e94c62be 100644
--- a/src/fne/network/callhandler/packetdata/DMRPacketData.cpp
+++ b/src/fne/network/callhandler/packetdata/DMRPacketData.cpp
@@ -81,7 +81,6 @@ bool DMRPacketData::processFrame(const uint8_t* data, uint32_t len, uint32_t pee
     dmrData.setFLCO(flco);
 
     bool dataSync = (data[15U] & 0x20U) == 0x20U;
-    bool voiceSync = (data[15U] & 0x10U) == 0x10U;
 
     if (dataSync) {
         dmrData.setData(data + 20U);
@@ -158,7 +157,7 @@ bool DMRPacketData::processFrame(const uint8_t* data, uint32_t len, uint32_t pee
 
                 m_status[peerId] = status;
                 
-                LogMessage(LOG_NET, "DMR, Data Call Start, peer = %u, slot = %u, srcId = %u, dstId = %u, streamId = %u, external = %u", peerId, status->slotNo, status->srcId, status->dstId, streamId, external);
+                LogMessage(LOG_NET, "DMR, Data Call Start, peer = %u, slot = %u, srcId = %u, dstId = %u, group = %u, streamId = %u, external = %u", peerId, status->slotNo, status->srcId, status->dstId, gi, streamId, external);
                 dispatchToFNE(peerId, dmrData, data, len, seqNo, pktSeq, streamId);
 
                 return true;
@@ -212,8 +211,8 @@ bool DMRPacketData::processFrame(const uint8_t* data, uint32_t len, uint32_t pee
             bool gi = status->header.getGI();
             uint32_t srcId = status->header.getSrcId();
             uint32_t dstId = status->header.getDstId();
-            LogMessage(LOG_NET, "P25, Data Call End, peer = %u, slot = %u, srcId = %u, dstId = %u, blocks = %u, duration = %u, streamId = %u, external = %u",
-                peerId, srcId, dstId, status->header.getBlocksToFollow(), duration / 1000, streamId, external);
+            LogMessage(LOG_NET, "P25, Data Call End, peer = %u, slot = %u, srcId = %u, dstId = %u, group = %u, blocks = %u, duration = %u, streamId = %u, external = %u",
+                peerId, srcId, dstId, gi, status->header.getBlocksToFollow(), duration / 1000, streamId, external);
 
             // report call event to InfluxDB
             if (m_network->m_enableInfluxDB) {
@@ -266,7 +265,6 @@ void DMRPacketData::dispatchToFNE(uint32_t peerId, dmr::data::NetData& dmrData,
 {
     RxStatus* status = m_status[peerId];
 
-    bool gi = status->header.getGI();
     uint32_t srcId = status->header.getSrcId();
     uint32_t dstId = status->header.getDstId();
 
diff --git a/src/fne/network/callhandler/packetdata/P25PacketData.cpp b/src/fne/network/callhandler/packetdata/P25PacketData.cpp
index 92f41e7a..5167eac0 100644
--- a/src/fne/network/callhandler/packetdata/P25PacketData.cpp
+++ b/src/fne/network/callhandler/packetdata/P25PacketData.cpp
@@ -74,7 +74,6 @@ bool P25PacketData::processFrame(const uint8_t* data, uint32_t len, uint32_t pee
 
     uint32_t blockLength = __GET_UINT16(data, 8U);
 
-    uint8_t blocksToFollow = data[20U];
     uint8_t currentBlock = data[21U];
 
     if (blockLength == 0U)
@@ -416,7 +415,7 @@ void P25PacketData::dispatch(uint32_t peerId)
         uint16_t opcode = __GET_UINT16B(arpPacket, 6U);
         uint32_t srcHWAddr = __GET_UINT16(arpPacket, 8U);
         uint32_t srcProtoAddr = __GET_UINT32(arpPacket, 11U);
-        uint32_t tgtHWAddr = __GET_UINT16(arpPacket, 15U);
+        //uint32_t tgtHWAddr = __GET_UINT16(arpPacket, 15U);
         uint32_t tgtProtoAddr = __GET_UINT32(arpPacket, 18U);
 
         if (opcode == P25_PDU_ARP_REQUEST) {