diff --git a/DMR2YSF/Conf.cpp b/DMR2YSF/Conf.cpp
index 0f8cdbf..4297c56 100644
--- a/DMR2YSF/Conf.cpp
+++ b/DMR2YSF/Conf.cpp
@@ -43,6 +43,17 @@ m_dstPort(0U),
 m_localAddress(),
 m_localPort(0U),
 m_fcsFile(),
+m_fichCallSign(2U),
+m_fichCallMode(0U),
+m_fichFrameTotal(7U),
+m_fichMessageRoute(0U),
+m_fichVOIP(0U),
+m_fichDataType(2U),
+m_fichSQLType(0U),
+m_fichSQLCode(0U),
+m_ysfDT1(),
+m_ysfDT2(),
+m_ysfRadioID(),
 m_daemon(false),
 m_debug(false),
 m_dmrId(0U),
diff --git a/DMR2YSF/DMR2YSF.cpp b/DMR2YSF/DMR2YSF.cpp
index a292bac..1face91 100644
--- a/DMR2YSF/DMR2YSF.cpp
+++ b/DMR2YSF/DMR2YSF.cpp
@@ -920,9 +920,9 @@ unsigned int CDMR2YSF::findYSFID(std::string cs, bool showdst)
 	if (id == 0) {
 		id = m_defsrcid;
 		if (showdst)
-			LogMessage("Not DMR ID found, using default ID: %u, DstID: %s%u", id, dmrpc ? "" : "TG ", m_dstid);
+			LogMessage("DMR ID not found, using default ID: %u, DstID: %s%u", id, dmrpc ? "" : "TG ", m_dstid);
 		else
-			LogMessage("Not DMR ID found, using default ID: %u", id);
+			LogMessage("DMR ID not found, using default ID: %u", id);
 	}
 	else {
 		if (showdst)
diff --git a/DMR2YSF/DMR2YSF.ini b/DMR2YSF/DMR2YSF.ini
index ed24d34..be20a7a 100644
--- a/DMR2YSF/DMR2YSF.ini
+++ b/DMR2YSF/DMR2YSF.ini
@@ -6,15 +6,14 @@ LocalAddress=127.0.0.1
 LocalPort=3200
 FCSRooms=FCSRooms.txt
 RadioID=*****
-FICHCallsign=2
-FICHCallMode=0
-FICHBlockTotal=0
-FICHFrameTotal=7
-FICHMessageRoute=0
-FICHVOIP=0
-FICHDataType=2
-FICHSQLType=0
-FICHSQLCode=0
+# FICHCallsign=2
+# FICHCallMode=0
+# FICHFrameTotal=7
+# FICHMessageRoute=0
+# FICHVOIP=0
+# FICHDataType=2
+# FICHSQLType=0
+# FICHSQLCode=0
 DT1=49,34,98,95,41,0,0,0,0,0
 DT2=0,0,0,0,108,32,28,32,3,8
 Daemon=0
diff --git a/DMR2YSF/YSFPayload.cpp b/DMR2YSF/YSFPayload.cpp
index adc868d..2f07b63 100644
--- a/DMR2YSF/YSFPayload.cpp
+++ b/DMR2YSF/YSFPayload.cpp
@@ -25,7 +25,7 @@
 #include <cstdint>
 
 const unsigned int INTERLEAVE_TABLE_9_20[] = {
-        0U, 40U,  80U, 120U, 160U, 200U, 240U, 280U, 320U, 
+        0U, 40U,  80U, 120U, 160U, 200U, 240U, 280U, 320U,
         2U, 42U,  82U, 122U, 162U, 202U, 242U, 282U, 322U,
         4U, 44U,  84U, 124U, 164U, 204U, 244U, 284U, 324U,
         6U, 46U,  86U, 126U, 166U, 206U, 246U, 286U, 326U,
@@ -609,7 +609,7 @@ std::string CYSFPayload::getDest()
 	std::string tmp;
 
 	if (m_dest)
-		tmp.assign((const char *)m_dest, YSF_CALLSIGN_LENGTH);
+		tmp.assign((const char *)m_dest, 5);
 	else
 		tmp = "";