diff --git a/plugins/channelrx/demodais/aisdemodgui.cpp b/plugins/channelrx/demodais/aisdemodgui.cpp
index 01c732105..99418b65e 100644
--- a/plugins/channelrx/demodais/aisdemodgui.cpp
+++ b/plugins/channelrx/demodais/aisdemodgui.cpp
@@ -262,6 +262,7 @@ QColor AISDemodGUI::getColor(const QString& mmsi)
                 return QColor(m_categoryColors.value(category));
             }
             qDebug() << "No color for " << category;
+            return Qt::white;
         }
         else
         {
diff --git a/plugins/channelrx/demodais/aisdemodsink.cpp b/plugins/channelrx/demodais/aisdemodsink.cpp
index ca1c74323..514ede9a7 100644
--- a/plugins/channelrx/demodais/aisdemodsink.cpp
+++ b/plugins/channelrx/demodais/aisdemodsink.cpp
@@ -66,7 +66,7 @@ void AISDemodSink::sampleToScope(Complex sample, Real magsq, Real fmDemod, Real
     if (m_scopeSink)
     {
         m_sampleBuffer[0][m_sampleBufferIndex] = sample;
-        m_sampleBuffer[1][m_sampleBufferIndex] = Complex(m_magsq, 0.0f);
+        m_sampleBuffer[1][m_sampleBufferIndex] = Complex(magsq, 0.0f);
         m_sampleBuffer[2][m_sampleBufferIndex] = Complex(fmDemod, 0.0f);
         m_sampleBuffer[3][m_sampleBufferIndex] = Complex(filt, 0.0f);
         m_sampleBuffer[4][m_sampleBufferIndex] = Complex(rxBuf, 0.0f);
diff --git a/plugins/feature/satellitetracker/satellitetrackergui.cpp b/plugins/feature/satellitetracker/satellitetrackergui.cpp
index 680d6b64a..a79915e9f 100644
--- a/plugins/feature/satellitetracker/satellitetrackergui.cpp
+++ b/plugins/feature/satellitetracker/satellitetrackergui.cpp
@@ -948,7 +948,7 @@ void SatelliteTrackerGUI::plotPolarChart()
             // Plot rotator position
             QString ourSourceName = QString("F0:%1 %2").arg(m_satelliteTracker->getIndexInFeatureSet()).arg(m_satelliteTracker->getIdentifier());  // Only one feature set in practice?
             std::vector<FeatureSet*>& featureSets = MainCore::instance()->getFeatureeSets();
-            for (int featureSetIndex = 0; featureSetIndex < featureSets.size(); featureSetIndex++)
+            for (int featureSetIndex = 0; featureSetIndex < (int)featureSets.size(); featureSetIndex++)
             {
                 FeatureSet *featureSet = featureSets[featureSetIndex];
                 for (int featureIndex = 0; featureIndex < featureSet->getNumberOfFeatures(); featureIndex++)