diff --git a/plugins/channelrx/demodrtty/rttydemodsink.cpp b/plugins/channelrx/demodrtty/rttydemodsink.cpp
index d4792f0f8..b9d094620 100644
--- a/plugins/channelrx/demodrtty/rttydemodsink.cpp
+++ b/plugins/channelrx/demodrtty/rttydemodsink.cpp
@@ -41,12 +41,12 @@ RttyDemodSink::RttyDemodSink(RttyDemod *packetDemod) :
         m_prods1(nullptr),
         m_prods2(nullptr),
         m_exp(nullptr),
+        m_sampleIdx(0),
         m_clockHistogram(100),
         m_shiftEstMag(m_fftSize),
         m_fftSequence(-1),
         m_fft(nullptr),
         m_fftCounter(0),
-        m_sampleIdx(0),
         m_sampleBufferIndex(0)
 {
     m_magsq = 0.0;
diff --git a/plugins/channelrx/demodrtty/rttydemodsink.h b/plugins/channelrx/demodrtty/rttydemodsink.h
index e99e0397a..15e49d769 100644
--- a/plugins/channelrx/demodrtty/rttydemodsink.h
+++ b/plugins/channelrx/demodrtty/rttydemodsink.h
@@ -139,7 +139,7 @@ private:
     BaudotDecoder m_rttyDecoder;
 
     // For baud rate estimation
-    int m_cycleCount;
+    unsigned int m_cycleCount;
     std::vector<int> m_clockHistogram;
     int m_edgeCount;
     MovingAverageUtil<Real, Real, 5> m_baudRateAverage;