diff --git a/devices/xtrx/devicextrx.cpp b/devices/xtrx/devicextrx.cpp
index 26c5e245d..3e6b980ed 100644
--- a/devices/xtrx/devicextrx.cpp
+++ b/devices/xtrx/devicextrx.cpp
@@ -41,7 +41,9 @@ DeviceXTRX::DeviceXTRX() :
     m_inputRate(0),
     m_outputRate(0),
     m_masterRate(0),
-    m_clockGen(0)
+    m_clockGen(0),
+    m_actualInputRate(0),
+    m_actualOutputRate(0)
 {}
 
 DeviceXTRX::~DeviceXTRX()
diff --git a/plugins/samplemimo/testmi/testmi.cpp b/plugins/samplemimo/testmi/testmi.cpp
index 39cbbce8e..89a5aa0ff 100644
--- a/plugins/samplemimo/testmi/testmi.cpp
+++ b/plugins/samplemimo/testmi/testmi.cpp
@@ -456,8 +456,8 @@ bool TestMI::applySettings(const TestMISettings& settings, bool force)
             || (m_settings.m_streams[istream].m_fcPos != settings.m_streams[istream].m_fcPos) || force)
         {
             int sampleRate = settings.m_streams[istream].m_sampleRate/(1<<settings.m_streams[istream].m_log2Decim);
-            DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, settings.m_streams[istream].m_centerFrequency);
-            m_fileSinks[istream]->handleMessage(*notif); // forward to file sink
+            DSPSignalNotification notif(sampleRate, settings.m_streams[istream].m_centerFrequency);
+            m_fileSinks[istream]->handleMessage(notif); // forward to file sink
             DSPMIMOSignalNotification *engineNotif = new DSPMIMOSignalNotification(
                 sampleRate, settings.m_streams[istream].m_centerFrequency, true, istream);
             m_deviceAPI->getDeviceEngineInputMessageQueue()->push(engineNotif);
@@ -837,6 +837,8 @@ void TestMI::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void TestMI::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesink/bladerf1output/bladerf1output.cpp b/plugins/samplesink/bladerf1output/bladerf1output.cpp
index e6989cf53..535df2dae 100644
--- a/plugins/samplesink/bladerf1output/bladerf1output.cpp
+++ b/plugins/samplesink/bladerf1output/bladerf1output.cpp
@@ -753,6 +753,8 @@ void Bladerf1Output::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void Bladerf1Output::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesink/bladerf2output/bladerf2output.cpp b/plugins/samplesink/bladerf2output/bladerf2output.cpp
index b87c45860..d0305f02f 100644
--- a/plugins/samplesink/bladerf2output/bladerf2output.cpp
+++ b/plugins/samplesink/bladerf2output/bladerf2output.cpp
@@ -1201,6 +1201,8 @@ void BladeRF2Output::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void BladeRF2Output::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesink/hackrfoutput/hackrfoutput.cpp b/plugins/samplesink/hackrfoutput/hackrfoutput.cpp
index 6f80f555e..93c2d5f26 100644
--- a/plugins/samplesink/hackrfoutput/hackrfoutput.cpp
+++ b/plugins/samplesink/hackrfoutput/hackrfoutput.cpp
@@ -751,6 +751,8 @@ void HackRFOutput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void HackRFOutput::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp
index e72c979d0..1ff296ccd 100644
--- a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp
+++ b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp
@@ -301,10 +301,10 @@ void HackRFOutputGui::on_centerFrequency_changed(quint64 value)
 
 void HackRFOutputGui::on_sampleRate_changed(quint64 value)
 {
-    if (m_sampleRateMode) {
-        m_settings.m_devSampleRate = value;
-    } else {
-        m_settings.m_devSampleRate = value * (1 << m_settings.m_log2Interp);
+    m_settings.m_devSampleRate = value;
+
+    if (!m_sampleRateMode) {
+        m_settings.m_devSampleRate <<= m_settings.m_log2Interp;
     }
 
     displayFcTooltip();
@@ -345,11 +345,10 @@ void HackRFOutputGui::on_interp_currentIndexChanged(int index)
 
 	m_settings.m_log2Interp = index;
     displaySampleRate();
+    m_settings.m_devSampleRate = ui->sampleRate->getValueNew();
 
-    if (m_sampleRateMode) {
-        m_settings.m_devSampleRate = ui->sampleRate->getValueNew();
-    } else {
-        m_settings.m_devSampleRate = ui->sampleRate->getValueNew() * (1 << m_settings.m_log2Interp);
+    if (!m_sampleRateMode) {
+        m_settings.m_devSampleRate <<= m_settings.m_log2Interp;
     }
 
 	sendSettings();
diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputthread.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputthread.cpp
index 3d83dd57a..6bb15284e 100644
--- a/plugins/samplesink/hackrfoutput/hackrfoutputthread.cpp
+++ b/plugins/samplesink/hackrfoutput/hackrfoutputthread.cpp
@@ -27,7 +27,8 @@ HackRFOutputThread::HackRFOutputThread(hackrf_device* dev, SampleSourceFifo* sam
 	m_running(false),
 	m_dev(dev),
 	m_sampleFifo(sampleFifo),
-	m_log2Interp(0)
+	m_log2Interp(0),
+    m_fcPos(2)
 {
     std::fill(m_buf, m_buf + 2*HACKRF_BLOCKSIZE, 0);
 }
diff --git a/plugins/samplesink/limesdroutput/limesdroutput.cpp b/plugins/samplesink/limesdroutput/limesdroutput.cpp
index 700cfc70f..3cb3dd756 100644
--- a/plugins/samplesink/limesdroutput/limesdroutput.cpp
+++ b/plugins/samplesink/limesdroutput/limesdroutput.cpp
@@ -1546,6 +1546,8 @@ void LimeSDROutput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void LimeSDROutput::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesink/localoutput/localoutput.cpp b/plugins/samplesink/localoutput/localoutput.cpp
index 89d42e157..686c84ecb 100644
--- a/plugins/samplesink/localoutput/localoutput.cpp
+++ b/plugins/samplesink/localoutput/localoutput.cpp
@@ -41,6 +41,9 @@ MESSAGE_CLASS_DEFINITION(LocalOutput::MsgReportSampleRateAndFrequency, Message)
 LocalOutput::LocalOutput(DeviceAPI *deviceAPI) :
     m_deviceAPI(deviceAPI),
     m_settings(),
+    m_centerFrequency(0),
+    m_sampleRate(48000),
+    m_fileSink(nullptr),
 	m_deviceDescription("LocalOutput")
 {
 	m_sampleSourceFifo.resize(96000 * 4);
@@ -376,6 +379,8 @@ void LocalOutput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void LocalOutput::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesink/plutosdroutput/plutosdroutput.cpp b/plugins/samplesink/plutosdroutput/plutosdroutput.cpp
index 58da35428..897c08b5f 100644
--- a/plugins/samplesink/plutosdroutput/plutosdroutput.cpp
+++ b/plugins/samplesink/plutosdroutput/plutosdroutput.cpp
@@ -879,6 +879,8 @@ void PlutoSDROutput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void PlutoSDROutput::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp b/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp
index 1a908c740..96f1779c8 100644
--- a/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp
+++ b/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp
@@ -205,11 +205,10 @@ void PlutoSDROutputGUI::on_swInterp_currentIndexChanged(int index)
 {
     m_settings.m_log2Interp = index > 5 ? 5 : index;
     displaySampleRate();
+    m_settings.m_devSampleRate = ui->sampleRate->getValueNew();
 
-    if (m_sampleRateMode) {
-        m_settings.m_devSampleRate = ui->sampleRate->getValueNew();
-    } else {
-        m_settings.m_devSampleRate = ui->sampleRate->getValueNew() * (1 << m_settings.m_log2Interp);
+    if (!m_sampleRateMode) {
+        m_settings.m_devSampleRate <<= m_settings.m_log2Interp;
     }
 
     sendSettings();
@@ -217,10 +216,10 @@ void PlutoSDROutputGUI::on_swInterp_currentIndexChanged(int index)
 
 void PlutoSDROutputGUI::on_sampleRate_changed(quint64 value)
 {
-    if (m_sampleRateMode) {
-        m_settings.m_devSampleRate = value;
-    } else {
-        m_settings.m_devSampleRate = value * (1 << m_settings.m_log2Interp);
+    m_settings.m_devSampleRate = value;
+
+    if (!m_sampleRateMode) {
+        m_settings.m_devSampleRate <<= m_settings.m_log2Interp;
     }
 
     sendSettings();
diff --git a/plugins/samplesink/remoteoutput/remoteoutput.cpp b/plugins/samplesink/remoteoutput/remoteoutput.cpp
index 527cf0e39..6217e286a 100644
--- a/plugins/samplesink/remoteoutput/remoteoutput.cpp
+++ b/plugins/samplesink/remoteoutput/remoteoutput.cpp
@@ -702,4 +702,6 @@ void RemoteOutput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
diff --git a/plugins/samplesink/soapysdroutput/soapysdroutput.cpp b/plugins/samplesink/soapysdroutput/soapysdroutput.cpp
index 5b8707639..d56955393 100644
--- a/plugins/samplesink/soapysdroutput/soapysdroutput.cpp
+++ b/plugins/samplesink/soapysdroutput/soapysdroutput.cpp
@@ -1922,6 +1922,8 @@ void SoapySDROutput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void SoapySDROutput::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesink/xtrxoutput/xtrxoutput.cpp b/plugins/samplesink/xtrxoutput/xtrxoutput.cpp
index 4ee6b9bf3..b6700c266 100644
--- a/plugins/samplesink/xtrxoutput/xtrxoutput.cpp
+++ b/plugins/samplesink/xtrxoutput/xtrxoutput.cpp
@@ -1428,6 +1428,8 @@ void XTRXOutput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void XTRXOutput::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesource/airspy/airspyinput.cpp b/plugins/samplesource/airspy/airspyinput.cpp
index e7d1f7ee9..9d10928a1 100644
--- a/plugins/samplesource/airspy/airspyinput.cpp
+++ b/plugins/samplesource/airspy/airspyinput.cpp
@@ -893,6 +893,8 @@ void AirspyInput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void AirspyInput::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesource/airspyhf/airspyhfinput.cpp b/plugins/samplesource/airspyhf/airspyhfinput.cpp
index dd8772ed9..a1a8fed48 100644
--- a/plugins/samplesource/airspyhf/airspyhfinput.cpp
+++ b/plugins/samplesource/airspyhf/airspyhfinput.cpp
@@ -917,6 +917,8 @@ void AirspyHFInput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void AirspyHFInput::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesource/bladerf1input/bladerf1input.cpp b/plugins/samplesource/bladerf1input/bladerf1input.cpp
index d66773084..23123949c 100644
--- a/plugins/samplesource/bladerf1input/bladerf1input.cpp
+++ b/plugins/samplesource/bladerf1input/bladerf1input.cpp
@@ -860,6 +860,8 @@ void Bladerf1Input::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void Bladerf1Input::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesource/bladerf2input/bladerf2input.cpp b/plugins/samplesource/bladerf2input/bladerf2input.cpp
index 7245de741..949b1f21f 100644
--- a/plugins/samplesource/bladerf2input/bladerf2input.cpp
+++ b/plugins/samplesource/bladerf2input/bladerf2input.cpp
@@ -1343,6 +1343,8 @@ void BladeRF2Input::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void BladeRF2Input::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesource/fcdpro/fcdproinput.cpp b/plugins/samplesource/fcdpro/fcdproinput.cpp
index 6698788f0..0568d4ecf 100644
--- a/plugins/samplesource/fcdpro/fcdproinput.cpp
+++ b/plugins/samplesource/fcdpro/fcdproinput.cpp
@@ -1149,6 +1149,8 @@ void FCDProInput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void FCDProInput::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp
index fc4bbdddc..e9ca69619 100644
--- a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp
+++ b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp
@@ -813,6 +813,8 @@ void FCDProPlusInput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void FCDProPlusInput::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesource/filesource/filesourceinput.cpp b/plugins/samplesource/filesource/filesourceinput.cpp
index f456da78a..ba93feca3 100644
--- a/plugins/samplesource/filesource/filesourceinput.cpp
+++ b/plugins/samplesource/filesource/filesourceinput.cpp
@@ -658,6 +658,8 @@ void FileSourceInput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void FileSourceInput::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesource/hackrfinput/hackrfinput.cpp b/plugins/samplesource/hackrfinput/hackrfinput.cpp
index 6c808d028..096dc9c70 100644
--- a/plugins/samplesource/hackrfinput/hackrfinput.cpp
+++ b/plugins/samplesource/hackrfinput/hackrfinput.cpp
@@ -825,6 +825,8 @@ void HackRFInput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void HackRFInput::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp
index 71c119f2d..9118b6987 100644
--- a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp
+++ b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp
@@ -345,10 +345,10 @@ void HackRFInputGui::on_centerFrequency_changed(quint64 value)
 
 void HackRFInputGui::on_sampleRate_changed(quint64 value)
 {
-    if (m_sampleRateMode) {
-        m_settings.m_devSampleRate = value;
-    } else {
-        m_settings.m_devSampleRate = value * (1 << m_settings.m_log2Decim);
+    m_settings.m_devSampleRate = value;
+
+    if (!m_sampleRateMode) {
+        m_settings.m_devSampleRate <<= m_settings.m_log2Decim;
     }
 
     displayFcTooltip();
@@ -363,11 +363,10 @@ void HackRFInputGui::on_decim_currentIndexChanged(int index)
 
 	m_settings.m_log2Decim = index;
     displaySampleRate();
+    m_settings.m_devSampleRate = ui->sampleRate->getValueNew();
 
-    if (m_sampleRateMode) {
-        m_settings.m_devSampleRate = ui->sampleRate->getValueNew();
-    } else {
-        m_settings.m_devSampleRate = ui->sampleRate->getValueNew() * (1 << m_settings.m_log2Decim);
+    if (!m_sampleRateMode) {
+        m_settings.m_devSampleRate <<= m_settings.m_log2Decim;
     }
 
     sendSettings();
diff --git a/plugins/samplesource/kiwisdr/kiwisdrinput.cpp b/plugins/samplesource/kiwisdr/kiwisdrinput.cpp
index aaca03fa9..f61565d4e 100644
--- a/plugins/samplesource/kiwisdr/kiwisdrinput.cpp
+++ b/plugins/samplesource/kiwisdr/kiwisdrinput.cpp
@@ -545,6 +545,8 @@ void KiwiSDRInput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void KiwiSDRInput::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesource/limesdrinput/limesdrinput.cpp b/plugins/samplesource/limesdrinput/limesdrinput.cpp
index dcef3de24..ed347ad21 100644
--- a/plugins/samplesource/limesdrinput/limesdrinput.cpp
+++ b/plugins/samplesource/limesdrinput/limesdrinput.cpp
@@ -1790,6 +1790,8 @@ void LimeSDRInput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void LimeSDRInput::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesource/localinput/localinput.cpp b/plugins/samplesource/localinput/localinput.cpp
index a5e0b7805..8e46d14e0 100644
--- a/plugins/samplesource/localinput/localinput.cpp
+++ b/plugins/samplesource/localinput/localinput.cpp
@@ -43,6 +43,7 @@ MESSAGE_CLASS_DEFINITION(LocalInput::MsgReportSampleRateAndFrequency, Message)
 LocalInput::LocalInput(DeviceAPI *deviceAPI) :
     m_deviceAPI(deviceAPI),
     m_settings(),
+    m_centerFrequency(0),
 	m_deviceDescription("LocalInput")
 {
 	m_sampleFifo.setSize(96000 * 4);
@@ -457,6 +458,8 @@ void LocalInput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void LocalInput::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesource/perseus/perseusinput.cpp b/plugins/samplesource/perseus/perseusinput.cpp
index 72fcacc60..5f65c6ccb 100644
--- a/plugins/samplesource/perseus/perseusinput.cpp
+++ b/plugins/samplesource/perseus/perseusinput.cpp
@@ -698,6 +698,8 @@ void PerseusInput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void PerseusInput::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesource/plutosdrinput/plutosdrinput.cpp b/plugins/samplesource/plutosdrinput/plutosdrinput.cpp
index 97bc9d714..b68077d1b 100644
--- a/plugins/samplesource/plutosdrinput/plutosdrinput.cpp
+++ b/plugins/samplesource/plutosdrinput/plutosdrinput.cpp
@@ -1022,6 +1022,8 @@ void PlutoSDRInput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void PlutoSDRInput::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp
index d514d7170..ca05c13d8 100644
--- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp
+++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp
@@ -230,11 +230,10 @@ void PlutoSDRInputGui::on_swDecim_currentIndexChanged(int index)
 {
     m_settings.m_log2Decim = index > 6 ? 6 : index;
     displaySampleRate();
+    m_settings.m_devSampleRate = ui->sampleRate->getValueNew();
 
-    if (m_sampleRateMode) {
-        m_settings.m_devSampleRate = ui->sampleRate->getValueNew();
-    } else {
-        m_settings.m_devSampleRate = ui->sampleRate->getValueNew() * (1 << m_settings.m_log2Decim);
+    if (!m_sampleRateMode) {
+        m_settings.m_devSampleRate <<= m_settings.m_log2Decim;
     }
 
     sendSettings();
@@ -249,10 +248,10 @@ void PlutoSDRInputGui::on_fcPos_currentIndexChanged(int index)
 
 void PlutoSDRInputGui::on_sampleRate_changed(quint64 value)
 {
-    if (m_sampleRateMode) {
-        m_settings.m_devSampleRate = value;
-    } else {
-        m_settings.m_devSampleRate = value * (1 << m_settings.m_log2Decim);
+    m_settings.m_devSampleRate = value;
+
+    if (!m_sampleRateMode) {
+        m_settings.m_devSampleRate <<= m_settings.m_log2Decim;
     }
 
     displayFcTooltip();
diff --git a/plugins/samplesource/remoteinput/remoteinput.cpp b/plugins/samplesource/remoteinput/remoteinput.cpp
index 5224cbf66..fe4d86ea6 100644
--- a/plugins/samplesource/remoteinput/remoteinput.cpp
+++ b/plugins/samplesource/remoteinput/remoteinput.cpp
@@ -507,6 +507,8 @@ void RemoteInput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void RemoteInput::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp
index 9a3229c24..b0457e2fc 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp
@@ -862,6 +862,8 @@ void RTLSDRInput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void RTLSDRInput::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesource/sdrplay/sdrplayinput.cpp b/plugins/samplesource/sdrplay/sdrplayinput.cpp
index afd948273..f467b962e 100644
--- a/plugins/samplesource/sdrplay/sdrplayinput.cpp
+++ b/plugins/samplesource/sdrplay/sdrplayinput.cpp
@@ -949,6 +949,8 @@ void SDRPlayInput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void SDRPlayInput::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesource/soapysdrinput/soapysdrinput.cpp b/plugins/samplesource/soapysdrinput/soapysdrinput.cpp
index eaee50da5..38d48cda8 100644
--- a/plugins/samplesource/soapysdrinput/soapysdrinput.cpp
+++ b/plugins/samplesource/soapysdrinput/soapysdrinput.cpp
@@ -2020,6 +2020,8 @@ void SoapySDRInput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void SoapySDRInput::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesource/testsource/testsourceinput.cpp b/plugins/samplesource/testsource/testsourceinput.cpp
index 6e3901731..6a8679006 100644
--- a/plugins/samplesource/testsource/testsourceinput.cpp
+++ b/plugins/samplesource/testsource/testsourceinput.cpp
@@ -727,6 +727,8 @@ void TestSourceInput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void TestSourceInput::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/samplesource/xtrxinput/xtrxinput.cpp b/plugins/samplesource/xtrxinput/xtrxinput.cpp
index c8a41c266..f83db19b5 100644
--- a/plugins/samplesource/xtrxinput/xtrxinput.cpp
+++ b/plugins/samplesource/xtrxinput/xtrxinput.cpp
@@ -1640,6 +1640,8 @@ void XTRXInput::webapiReverseSendStartStop(bool start)
     } else {
         m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
     }
+
+    delete swgDeviceSettings;
 }
 
 void XTRXInput::networkManagerFinished(QNetworkReply *reply)
diff --git a/sdrbase/audio/audionetsink.cpp b/sdrbase/audio/audionetsink.cpp
index 05b968bf4..94c8ec81b 100644
--- a/sdrbase/audio/audionetsink.cpp
+++ b/sdrbase/audio/audionetsink.cpp
@@ -40,6 +40,8 @@ AudioNetSink::AudioNetSink(QObject *parent) :
     m_port(9998)
 {
     std::fill(m_data, m_data+m_dataBlockSize, 0);
+    std::fill(m_opusIn, m_opusIn+m_opusBlockSize, 0);
+    m_codecRatio = (m_sampleRate / m_decimation) / (AudioOpus::m_bitrate / 8); // compressor ratio
     m_udpSocket = new QUdpSocket(parent);
 }
 
@@ -57,6 +59,8 @@ AudioNetSink::AudioNetSink(QObject *parent, int sampleRate, bool stereo) :
     m_port(9998)
 {
     std::fill(m_data, m_data+m_dataBlockSize, 0);
+    std::fill(m_opusIn, m_opusIn+m_opusBlockSize, 0);
+    m_codecRatio = (m_sampleRate / m_decimation) / (AudioOpus::m_bitrate / 8); // compressor ratio
     m_udpSocket = new QUdpSocket(parent);
     m_rtpBufferAudio = new RTPSink(m_udpSocket, sampleRate, stereo);
 }
diff --git a/sdrbase/channel/channelapi.cpp b/sdrbase/channel/channelapi.cpp
index 0eecc57b8..fa8ecb183 100644
--- a/sdrbase/channel/channelapi.cpp
+++ b/sdrbase/channel/channelapi.cpp
@@ -24,6 +24,7 @@ ChannelAPI::ChannelAPI(const QString& name, StreamType streamType) :
     m_streamType(streamType),
     m_name(name),
     m_indexInDeviceSet(-1),
+    m_deviceSetIndex(0),
     m_deviceAPI(0),
     m_uid(UidCalculator::getNewObjectId())
 { }
\ No newline at end of file
diff --git a/sdrbase/dsp/devicesamplesource.cpp b/sdrbase/dsp/devicesamplesource.cpp
index f1451f35e..fbf4b7a2e 100644
--- a/sdrbase/dsp/devicesamplesource.cpp
+++ b/sdrbase/dsp/devicesamplesource.cpp
@@ -139,7 +139,7 @@ qint32 DeviceSampleSource::calculateFrequencyShift(
             }
         }
     }
-    else if (frequencyShiftScheme == FSHIFT_TXSYNC)
+    else // frequencyShiftScheme == FSHIFT_TXSYNC
     {
         if (fcPos == FC_POS_CENTER) {
             return 0;
@@ -166,8 +166,4 @@ qint32 DeviceSampleSource::calculateFrequencyShift(
             return 0;
         }
     }
-    else
-    {
-        return 0;
-    }
 }
diff --git a/sdrbase/mainparser.cpp b/sdrbase/mainparser.cpp
index b1e935ea2..48a5fefdd 100644
--- a/sdrbase/mainparser.cpp
+++ b/sdrbase/mainparser.cpp
@@ -35,6 +35,7 @@ MainParser::MainParser() :
 {
     m_serverAddress = "127.0.0.1";
     m_serverPort = 8091;
+    m_mimoSupport = false;
     m_mimoOption.setFlags(QCommandLineOption::HiddenFromHelp);
 
     m_parser.setApplicationDescription("Software Defined Radio application");
diff --git a/sdrgui/dsp/scopevis.cpp b/sdrgui/dsp/scopevis.cpp
index 94acd8614..5b6df9620 100644
--- a/sdrgui/dsp/scopevis.cpp
+++ b/sdrgui/dsp/scopevis.cpp
@@ -54,6 +54,7 @@ ScopeVis::ScopeVis(GLScope* glScope) :
     m_timeBase(1),
     m_timeOfsProMill(0),
     m_traceStart(true),
+    m_triggerLocation(0),
     m_sampleRate(0),
     m_liveSampleRate(0),
     m_liveLog2Decim(0),