diff --git a/DMR2M17/DMR2M17 b/DMR2M17/DMR2M17
deleted file mode 100755
index 6bd9300..0000000
Binary files a/DMR2M17/DMR2M17 and /dev/null differ
diff --git a/M172DMR/M172DMR b/M172DMR/M172DMR
deleted file mode 100755
index d16b886..0000000
Binary files a/M172DMR/M172DMR and /dev/null differ
diff --git a/M172DMR/ModeConv.cpp b/M172DMR/ModeConv.cpp
index 4b53104..b9cde71 100644
--- a/M172DMR/ModeConv.cpp
+++ b/M172DMR/ModeConv.cpp
@@ -672,7 +672,6 @@ unsigned int CModeConv::getM17(unsigned char* data)
 		m_M17.getData(data, 8U);
 		m_M17.getData(tag+1, 1U);
 		m_M17.getData(data+8, 8U);
-		fprintf(stderr, "getM17() m_m17N:tag1:tag2 == %d:%d:%d\n", m_m17N, tag[0U], tag[1U]);
 		m_m17N -= 2U;
 	}
 	return (tag[1U] == TAG_EOT) ? tag[1U] : tag[0];
diff --git a/P252DMR/P252DMR.cpp b/P252DMR/P252DMR.cpp
index b378943..5303f77 100644
--- a/P252DMR/P252DMR.cpp
+++ b/P252DMR/P252DMR.cpp
@@ -799,7 +799,7 @@ int CP252DMR::run()
 		if (m_xlxReflectors != NULL)
 			m_xlxReflectors->clock(ms);
 
-		//if (ms < 5U) CThread::sleep(5U);
+		if (ms < 5U) CThread::sleep(5U);
 	}
 
 	m_p25Network->close();
diff --git a/YSF2P25/Conf.cpp b/YSF2P25/Conf.cpp
index d0f53d4..bd51a21 100644
--- a/YSF2P25/Conf.cpp
+++ b/YSF2P25/Conf.cpp
@@ -51,7 +51,7 @@ m_fichCallMode(0U),
 m_fichFrameTotal(6U),
 m_fichMessageRoute(0U),
 m_fichVOIP(0U),
-m_fichDataType(2U),
+m_fichDataType(3U),
 m_fichSQLType(0U),
 m_fichSQLCode(0U),
 m_ysfDT1(),
diff --git a/YSF2P25/ModeConv.cpp b/YSF2P25/ModeConv.cpp
index 3926108..8553cd0 100644
--- a/YSF2P25/ModeConv.cpp
+++ b/YSF2P25/ModeConv.cpp
@@ -247,6 +247,10 @@ unsigned int CModeConv::getYSF(unsigned char* data)
 			m_YSF.getData(tag, 1U);
 			m_YSF.getData(data, 11U);
 			m_ysfN -= 1U;
+			if(tag[0U] == TAG_EOT) {
+				m_YSF.clear();
+				m_ysfN = 0;
+			}
 			return tag[0U];
 		}
 	}
diff --git a/YSF2P25/YSF2P25.cpp b/YSF2P25/YSF2P25.cpp
index 966b8d9..7011c3f 100644
--- a/YSF2P25/YSF2P25.cpp
+++ b/YSF2P25/YSF2P25.cpp
@@ -721,7 +721,6 @@ int CYSF2P25::run()
 
 				// Send data to MMDVMHost
 				m_ysfNetwork->write(m_ysfFrame);
-
 				ysf_cnt++;
 				ysfWatch.start();
 			}
diff --git a/YSF2P25/YSF2P25.ini b/YSF2P25/YSF2P25.ini
index d333430..2b5418c 100644
--- a/YSF2P25/YSF2P25.ini
+++ b/YSF2P25/YSF2P25.ini
@@ -20,7 +20,7 @@ WiresXMakeUpper=1
 # FICHFrameTotal=6
 # FICHMessageRoute=0
 # FICHVOIP=0
-# FICHDataType=2
+# FICHDataType=3
 # FICHSQLType=0
 # FICHSQLCode=0
 DT1=1,34,97,95,43,3,17,0,0,0