diff --git a/plugins/channelrx/demodbfm/rdsdemod.cpp b/plugins/channelrx/demodbfm/rdsdemod.cpp
index fd5094f75..c38cccdf8 100644
--- a/plugins/channelrx/demodbfm/rdsdemod.cpp
+++ b/plugins/channelrx/demodbfm/rdsdemod.cpp
@@ -36,6 +36,7 @@ RDSDemod::RDSDemod()
 	m_srate = 250000;
 
 	m_parms.subcarr_phi = 0;
+	memset(m_parms.subcarr_bb, 0, sizeof(m_parms.subcarr_bb));
 	m_parms.clock_offset = 0;
 	m_parms.clock_phi = 0;
 	m_parms.prev_clock_phi = 0;
@@ -48,6 +49,7 @@ RDSDemod::RDSDemod()
 	m_parms.prev_acc = 0;
 	m_parms.counter = 0;
 	m_parms.reading_frame = 0;
+	memset(m_parms.tot_errs, 0, sizeof(m_parms.tot_errs));
 	m_parms.dbit = 0;
 	m_prev = 0.0f;
 	memset(m_xv, 0, 6*sizeof(Real));
diff --git a/plugins/samplesource/filesource/filesourcegui.cpp b/plugins/samplesource/filesource/filesourcegui.cpp
index d679ae889..c74a6270f 100644
--- a/plugins/samplesource/filesource/filesourcegui.cpp
+++ b/plugins/samplesource/filesource/filesourcegui.cpp
@@ -328,8 +328,8 @@ void FileSourceGui::updateWithStreamTime()
 	int t_msec = 0;
 
 	if (m_sampleRate > 0){
-		t_msec = ((m_samplesCount * 1000) / m_sampleRate) % 1000;
 		t_sec = m_samplesCount / m_sampleRate;
+		t_msec = (m_samplesCount - (t_sec * m_sampleRate)) * 1000 / m_sampleRate;
 	}
 
 	QTime t(0, 0, 0, 0);
diff --git a/qrtplib/rtpsession.cpp b/qrtplib/rtpsession.cpp
index 643858cb8..a9d42a8d2 100644
--- a/qrtplib/rtpsession.cpp
+++ b/qrtplib/rtpsession.cpp
@@ -209,7 +209,7 @@ int RTPSession::InternalCreate(const RTPSessionParams &sessparams)
     // Init the RTCP packet builder
 
     double timestampunit = sessparams.GetOwnTimestampUnit();
-    uint8_t buf[1024];
+    uint8_t buf[1024] = {0};
     std::size_t buflen = 1024;
     std::string forcedcname = sessparams.GetCNAME();