diff --git a/plugins/channelrx/wdsprx/wdsprxcwpeakdialog.h b/plugins/channelrx/wdsprx/wdsprxcwpeakdialog.h
index f8dbd89bb..67cd41ae6 100644
--- a/plugins/channelrx/wdsprx/wdsprxcwpeakdialog.h
+++ b/plugins/channelrx/wdsprx/wdsprxcwpeakdialog.h
@@ -35,7 +35,7 @@ public:
     };
 
     explicit WDSPRxCWPeakDialog(QWidget* parent = nullptr);
-    ~WDSPRxCWPeakDialog();
+    ~WDSPRxCWPeakDialog() override;
 
     void setCWPeakFrequency(double cwPeakFrequency);
     void setCWBandwidth(double cwBandwidth);
diff --git a/plugins/channelrx/wdsprx/wdsprxdnbdialog.h b/plugins/channelrx/wdsprx/wdsprxdnbdialog.h
index 9a811de9b..b0c6c6e86 100644
--- a/plugins/channelrx/wdsprx/wdsprxdnbdialog.h
+++ b/plugins/channelrx/wdsprx/wdsprxdnbdialog.h
@@ -39,7 +39,7 @@ public:
     };
 
     explicit WDSPRxDNBDialog(QWidget* parent = nullptr);
-    ~WDSPRxDNBDialog();
+    ~WDSPRxDNBDialog() override;
 
     void setNBScheme(WDSPRxProfile::WDSPRxNBScheme scheme);
     void setNB2Mode(WDSPRxProfile::WDSPRxNB2Mode mode);
diff --git a/plugins/channelrx/wdsprx/wdsprxdnrdialog.h b/plugins/channelrx/wdsprx/wdsprxdnrdialog.h
index 4e2fef336..359026f44 100644
--- a/plugins/channelrx/wdsprx/wdsprxdnrdialog.h
+++ b/plugins/channelrx/wdsprx/wdsprxdnrdialog.h
@@ -38,7 +38,7 @@ public:
     };
 
     explicit WDSPRxDNRDialog(QWidget* parent = nullptr);
-    ~WDSPRxDNRDialog();
+    ~WDSPRxDNRDialog() override;
 
     void setSNB(bool snb);
     void setNRScheme(WDSPRxProfile::WDSPRxNRScheme scheme);
diff --git a/plugins/channelrx/wdsprx/wdsprxeqdialog.h b/plugins/channelrx/wdsprx/wdsprxeqdialog.h
index 29319c2b0..3a03adae9 100644
--- a/plugins/channelrx/wdsprx/wdsprxeqdialog.h
+++ b/plugins/channelrx/wdsprx/wdsprxeqdialog.h
@@ -35,7 +35,7 @@ public:
     };
 
     explicit WDSPRxEqDialog(QWidget* parent = nullptr);
-    ~WDSPRxEqDialog();
+    ~WDSPRxEqDialog() override;
 
     void setEqF(const std::array<float, 11>& eqF);
     void setEqG(const std::array<float, 11>& eqG);
diff --git a/plugins/channelrx/wdsprx/wdsprxfmdialog.h b/plugins/channelrx/wdsprx/wdsprxfmdialog.h
index ec9ae1140..bcbd2c6f8 100644
--- a/plugins/channelrx/wdsprx/wdsprxfmdialog.h
+++ b/plugins/channelrx/wdsprx/wdsprxfmdialog.h
@@ -39,7 +39,7 @@ public:
     };
 
     explicit WDSPRxFMDialog(QWidget* parent = nullptr);
-    ~WDSPRxFMDialog();
+    ~WDSPRxFMDialog() override;
 
     void setDeviation(double deviation);
     void setAFLow(double afLow);
diff --git a/plugins/channelrx/wdsprx/wdsprxgui.cpp b/plugins/channelrx/wdsprx/wdsprxgui.cpp
index 3ff8640e5..b648c9c4b 100644
--- a/plugins/channelrx/wdsprx/wdsprxgui.cpp
+++ b/plugins/channelrx/wdsprx/wdsprxgui.cpp
@@ -286,6 +286,7 @@ void WDSPRxGUI::on_rit_toggled(bool checked)
 void WDSPRxGUI::on_ritFrequency_valueChanged(int value)
 {
     m_settings.m_ritFrequency = value;
+    m_settings.m_profiles[m_settings.m_profileIndex].m_ritFrequency = m_settings.m_ritFrequency;
     ui->ritFrequencyText->setText(tr("%1").arg(value));
     m_channelMarker.setShift(m_settings.m_rit ? value: 0);
     applySettings();
@@ -338,7 +339,7 @@ void WDSPRxGUI::on_profileIndex_valueChanged(int value)
         return;
     }
 
-    ui->filterIndexText->setText(tr("%1").arg(value));
+    ui->profileIndexText->setText(tr("%1").arg(value));
     m_settings.m_profileIndex = value;
     // Bandwidth setup
     ui->BW->setMaximum(480);
@@ -525,32 +526,32 @@ WDSPRxGUI::WDSPRxGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
 	m_spectrumVis->setGLSpectrum(ui->glSpectrum);
 	m_wdspRx->setMessageQueueToGUI(getInputMessageQueue());
 
-    CRightClickEnabler *audioMuteRightClickEnabler = new CRightClickEnabler(ui->audioMute);
-    connect(audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect(const QPoint &)));
+    m_audioMuteRightClickEnabler = new CRightClickEnabler(ui->audioMute);
+    connect(m_audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect(const QPoint &)));
 
-    CRightClickEnabler *agcRightClickEnabler = new CRightClickEnabler(ui->agc);
-    connect(agcRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(agcSetupDialog(const QPoint &)));
+    m_agcRightClickEnabler = new CRightClickEnabler(ui->agc);
+    connect(m_agcRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(agcSetupDialog(const QPoint &)));
 
-    CRightClickEnabler *dnbRightClickEnabler = new CRightClickEnabler(ui->dnb);
-    connect(dnbRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(dnbSetupDialog(const QPoint &)));
+    m_dnbRightClickEnabler = new CRightClickEnabler(ui->dnb);
+    connect(m_dnbRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(dnbSetupDialog(const QPoint &)));
 
-    CRightClickEnabler *dnrRightClickEnabler = new CRightClickEnabler(ui->dnr);
-    connect(dnrRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(dnrSetupDialog(const QPoint &)));
+    m_dnrRightClickEnabler = new CRightClickEnabler(ui->dnr);
+    connect(m_dnrRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(dnrSetupDialog(const QPoint &)));
 
-    CRightClickEnabler *cwPeakRightClickEnabler = new CRightClickEnabler(ui->cwPeaking);
-    connect(cwPeakRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(cwPeakSetupDialog(const QPoint &)));
+    m_cwPeakRightClickEnabler = new CRightClickEnabler(ui->cwPeaking);
+    connect(m_cwPeakRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(cwPeakSetupDialog(const QPoint &)));
 
-    CRightClickEnabler *squelchRightClickEnabler = new CRightClickEnabler(ui->squelch);
-    connect(squelchRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(squelchSetupDialog(const QPoint &)));
+    m_squelchRightClickEnabler = new CRightClickEnabler(ui->squelch);
+    connect(m_squelchRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(squelchSetupDialog(const QPoint &)));
 
-    CRightClickEnabler *equalizerRightClickEnabler = new CRightClickEnabler(ui->equalizer);
-    connect(equalizerRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(equalizerSetupDialog(const QPoint &)));
+    m_equalizerRightClickEnabler = new CRightClickEnabler(ui->equalizer);
+    connect(m_equalizerRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(equalizerSetupDialog(const QPoint &)));
 
-    CRightClickEnabler *panRightClickEnabler = new CRightClickEnabler(ui->audioBinaural);
-    connect(panRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(panSetupDialog(const QPoint &)));
+    m_panRightClickEnabler = new CRightClickEnabler(ui->audioBinaural);
+    connect(m_panRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(panSetupDialog(const QPoint &)));
 
-    CRightClickEnabler *demodRightClickEnabler = new CRightClickEnabler(ui->demod);
-    connect(demodRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(demodSetupDialog(const QPoint &)));
+    m_demodRightClickEnabler = new CRightClickEnabler(ui->demod);
+    connect(m_demodRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(demodSetupDialog(const QPoint &)));
 
     ui->deltaFrequencyLabel->setText(QString("%1f").arg(QChar(0x94, 0x03)));
     ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
@@ -610,6 +611,15 @@ WDSPRxGUI::WDSPRxGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
 WDSPRxGUI::~WDSPRxGUI()
 {
 	delete ui;
+    delete m_audioMuteRightClickEnabler;
+    delete m_agcRightClickEnabler;
+    delete m_dnbRightClickEnabler;
+    delete m_dnrRightClickEnabler;
+    delete m_cwPeakRightClickEnabler;
+    delete m_squelchRightClickEnabler;
+    delete m_equalizerRightClickEnabler;
+    delete m_panRightClickEnabler;
+    delete m_demodRightClickEnabler;
 }
 
 bool WDSPRxGUI::blockApplySettings(bool block)
@@ -862,10 +872,10 @@ void WDSPRxGUI::displaySettings()
     ui->spanLog2->blockSignals(true);
     ui->dsb->blockSignals(true);
     ui->BW->blockSignals(true);
-    ui->filterIndex->blockSignals(true);
+    ui->profileIndex->blockSignals(true);
 
-    ui->filterIndex->setValue(m_settings.m_profileIndex);
-    ui->filterIndexText->setText(tr("%1").arg(m_settings.m_profileIndex));
+    ui->profileIndex->setValue(m_settings.m_profileIndex);
+    ui->profileIndexText->setText(tr("%1").arg(m_settings.m_profileIndex));
 
     ui->dsb->setChecked(m_settings.m_dsb);
     ui->spanLog2->setValue(1 + ui->spanLog2->maximum() - m_settings.m_profiles[m_settings.m_profileIndex].m_spanLog2);
@@ -885,7 +895,7 @@ void WDSPRxGUI::displaySettings()
     ui->spanLog2->blockSignals(false);
     ui->dsb->blockSignals(false);
     ui->BW->blockSignals(false);
-    ui->filterIndex->blockSignals(false);
+    ui->profileIndex->blockSignals(false);
 
     // The only one of the four signals triggering applyBandwidths will trigger it once only with all other values
     // set correctly and therefore validate the settings and apply them to dependent widgets
@@ -950,7 +960,7 @@ void WDSPRxGUI::agcSetup(int iValueChanged)
         return;
     }
 
-    WDSPRxAGCDialog::ValueChanged valueChanged = (WDSPRxAGCDialog::ValueChanged) iValueChanged;
+    auto valueChanged = (WDSPRxAGCDialog::ValueChanged) iValueChanged;
 
     switch (valueChanged)
     {
@@ -998,7 +1008,7 @@ void WDSPRxGUI::dnbSetup(int32_t iValueChanged)
         return;
     }
 
-    WDSPRxDNBDialog::ValueChanged valueChanged = (WDSPRxDNBDialog::ValueChanged) iValueChanged;
+    auto valueChanged = (WDSPRxDNBDialog::ValueChanged) iValueChanged;
 
     switch (valueChanged)
     {
@@ -1065,7 +1075,7 @@ void WDSPRxGUI::dnrSetup(int32_t iValueChanged)
         return;
     }
 
-    WDSPRxDNRDialog::ValueChanged valueChanged = (WDSPRxDNRDialog::ValueChanged) iValueChanged;
+    auto valueChanged = (WDSPRxDNRDialog::ValueChanged) iValueChanged;
 
     switch (valueChanged)
     {
@@ -1124,7 +1134,7 @@ void WDSPRxGUI::cwPeakSetup(int iValueChanged)
         return;
     }
 
-    WDSPRxCWPeakDialog::ValueChanged valueChanged = (WDSPRxCWPeakDialog::ValueChanged) iValueChanged;
+    auto valueChanged = (WDSPRxCWPeakDialog::ValueChanged) iValueChanged;
 
     switch (valueChanged)
     {
@@ -1187,7 +1197,7 @@ void WDSPRxGUI::amSetup(int iValueChanged)
         return;
     }
 
-    WDSPRxAMDialog::ValueChanged valueChanged = (WDSPRxAMDialog::ValueChanged) iValueChanged;
+    auto valueChanged = (WDSPRxAMDialog::ValueChanged) iValueChanged;
 
     switch (valueChanged)
     {
@@ -1207,7 +1217,7 @@ void WDSPRxGUI::fmSetup(int iValueChanged)
         return;
     }
 
-    WDSPRxFMDialog::ValueChanged valueChanged = (WDSPRxFMDialog::ValueChanged) iValueChanged;
+    auto valueChanged = (WDSPRxFMDialog::ValueChanged) iValueChanged;
 
     switch (valueChanged)
     {
@@ -1272,7 +1282,7 @@ void WDSPRxGUI::squelchSetup(int iValueChanged)
         return;
     }
 
-    WDSPRxSquelchDialog::ValueChanged valueChanged = (WDSPRxSquelchDialog::ValueChanged) iValueChanged;
+    auto valueChanged = (WDSPRxSquelchDialog::ValueChanged) iValueChanged;
 
     switch (valueChanged)
     {
@@ -1320,7 +1330,7 @@ void WDSPRxGUI::equalizerSetup(int iValueChanged)
         return;
     }
 
-    WDSPRxEqDialog::ValueChanged valueChanged = (WDSPRxEqDialog::ValueChanged) iValueChanged;
+    auto valueChanged = (WDSPRxEqDialog::ValueChanged) iValueChanged;
 
     switch (valueChanged)
     {
@@ -1357,7 +1367,7 @@ void WDSPRxGUI::panSetup(int iValueChanged)
         return;
     }
 
-    WDSPRxPanDialog::ValueChanged valueChanged = (WDSPRxPanDialog::ValueChanged) iValueChanged;
+    auto valueChanged = (WDSPRxPanDialog::ValueChanged) iValueChanged;
 
     switch (valueChanged)
     {
@@ -1424,7 +1434,7 @@ void WDSPRxGUI::makeUIConnections()
     QObject::connect(ui->spanLog2, &QSlider::valueChanged, this, &WDSPRxGUI::on_spanLog2_valueChanged);
     QObject::connect(ui->flipSidebands, &QPushButton::clicked, this, &WDSPRxGUI::on_flipSidebands_clicked);
     QObject::connect(ui->fftWindow, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &WDSPRxGUI::on_fftWindow_currentIndexChanged);
-    QObject::connect(ui->filterIndex, &QDial::valueChanged, this, &WDSPRxGUI::on_profileIndex_valueChanged);
+    QObject::connect(ui->profileIndex, &QDial::valueChanged, this, &WDSPRxGUI::on_profileIndex_valueChanged);
     QObject::connect(ui->demod, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &WDSPRxGUI::on_demod_currentIndexChanged);
     QObject::connect(ui->cwPeaking, &ButtonSwitch::toggled, this, &WDSPRxGUI::on_cwPeaking_toggled);
     QObject::connect(ui->squelch, &ButtonSwitch::toggled, this, &WDSPRxGUI::on_squelch_toggled);
diff --git a/plugins/channelrx/wdsprx/wdsprxgui.h b/plugins/channelrx/wdsprx/wdsprxgui.h
index 96dcc892f..c89c3cc15 100644
--- a/plugins/channelrx/wdsprx/wdsprxgui.h
+++ b/plugins/channelrx/wdsprx/wdsprxgui.h
@@ -45,6 +45,7 @@ class WDSPRxEqDialog;
 class WDSPRxPanDialog;
 class SpectrumVis;
 class BasebandSampleSink;
+class CRightClickEnabler;
 
 namespace Ui {
 	class WDSPRxGUI;
@@ -108,6 +109,16 @@ private:
     WDSPRxEqDialog* m_equalizerDialog;
     WDSPRxPanDialog* m_panDialog;
 
+    CRightClickEnabler *m_audioMuteRightClickEnabler;
+    CRightClickEnabler *m_agcRightClickEnabler;
+    CRightClickEnabler *m_dnbRightClickEnabler;
+    CRightClickEnabler *m_dnrRightClickEnabler;
+    CRightClickEnabler *m_cwPeakRightClickEnabler;
+    CRightClickEnabler *m_squelchRightClickEnabler;
+    CRightClickEnabler *m_equalizerRightClickEnabler;
+    CRightClickEnabler *m_panRightClickEnabler;
+    CRightClickEnabler *m_demodRightClickEnabler;
+
 	QIcon m_iconDSBUSB;
 	QIcon m_iconDSBLSB;
 
diff --git a/plugins/channelrx/wdsprx/wdsprxgui.ui b/plugins/channelrx/wdsprx/wdsprxgui.ui
index af38871ef..bd3233c9a 100644
--- a/plugins/channelrx/wdsprx/wdsprxgui.ui
+++ b/plugins/channelrx/wdsprx/wdsprxgui.ui
@@ -278,7 +278,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QDial" name="filterIndex">
+         <widget class="QDial" name="profileIndex">
           <property name="maximumSize">
            <size>
             <width>24</width>
@@ -303,7 +303,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QLabel" name="filterIndexText">
+         <widget class="QLabel" name="profileIndexText">
           <property name="minimumSize">
            <size>
             <width>10</width>
diff --git a/plugins/channelrx/wdsprx/wdsprxpandialog.h b/plugins/channelrx/wdsprx/wdsprxpandialog.h
index 95b7694dc..56363443a 100644
--- a/plugins/channelrx/wdsprx/wdsprxpandialog.h
+++ b/plugins/channelrx/wdsprx/wdsprxpandialog.h
@@ -33,7 +33,7 @@ public:
     };
 
     explicit WDSPRxPanDialog(QWidget* parent = nullptr);
-    ~WDSPRxPanDialog();
+    ~WDSPRxPanDialog() override;
 
     void setPan(double pan);
     double getPan() const { return m_pan; }
diff --git a/plugins/channelrx/wdsprx/wdsprxsquelchdialog.h b/plugins/channelrx/wdsprx/wdsprxsquelchdialog.h
index cbd611f5d..8e72ee47f 100644
--- a/plugins/channelrx/wdsprx/wdsprxsquelchdialog.h
+++ b/plugins/channelrx/wdsprx/wdsprxsquelchdialog.h
@@ -36,7 +36,7 @@ public:
     };
 
     explicit WDSPRxSquelchDialog(QWidget* parent = nullptr);
-    ~WDSPRxSquelchDialog();
+    ~WDSPRxSquelchDialog() override;
 
     void setMode(WDSPRxProfile::WDSPRxSquelchMode mode);
     void setSSQLTauMute(double value);