diff --git a/DMRSlot.h b/DMRSlot.h
index 751d3c1..5649d6b 100644
--- a/DMRSlot.h
+++ b/DMRSlot.h
@@ -62,8 +62,8 @@ private:
 	CDMRDataHeader             m_netDataHeader;
 	unsigned char              m_rfSeqNo;
 	unsigned char              m_netSeqNo;
-	unsigned char              m_netN;
 	unsigned char              m_rfN;
+	unsigned char              m_netN;
 	CTimer                     m_networkWatchdog;
 	CTimer                     m_rfTimeoutTimer;
 	CTimer                     m_netTimeoutTimer;
diff --git a/YSFControl.cpp b/YSFControl.cpp
index cc6a17e..44175a1 100644
--- a/YSFControl.cpp
+++ b/YSFControl.cpp
@@ -74,8 +74,6 @@ bool CYSFControl::writeModem(unsigned char *data)
 		return false;
 
 	bool valid = (data[1U] & YSF_CKSUM_OK) == YSF_CKSUM_OK;
-	unsigned char fi = data[1U] & YSF_FI_MASK;
-	unsigned char dt = data[1U] & YSF_DT_MASK;
 
 	if (type == TAG_DATA && valid && m_state == RS_RF_LISTENING) {
 		m_frames = 0U;
@@ -144,7 +142,7 @@ bool CYSFControl::writeModem(unsigned char *data)
 			unsigned char fn = m_fich.getFN();
 			unsigned char dt = m_fich.getDT();
 
-			LogMessage("YSF, Valid FICH, FI=%X FN=%u DT=%X", m_fich.getFI(), m_fich.getFN(), m_fich.getDT());
+			LogMessage("YSF, Valid FICH, FI=%X FN=%u DT=%X", fi, fn, dt);
 
 			m_payload.decode(data + 2U, fi, fn, dt);
 			// payload.encode(data + 2U);			XXX
diff --git a/YSFConvolution.cpp b/YSFConvolution.cpp
index fea12e1..a8afa0b 100644
--- a/YSFConvolution.cpp
+++ b/YSFConvolution.cpp
@@ -89,7 +89,7 @@ void CYSFConvolution::decode(uint8_t s0, uint8_t s1)
 
   ++m_dp;
 
-  assert((m_dp - m_decisions) <= 180U);
+  assert((m_dp - m_decisions) <= 180);
 
   uint16_t* tmp = m_oldMetrics;
   m_oldMetrics = m_newMetrics;