diff --git a/plugins/channeltx/modam/ammodgui.ui b/plugins/channeltx/modam/ammodgui.ui
index bbe7f3046..f8c801788 100644
--- a/plugins/channeltx/modam/ammodgui.ui
+++ b/plugins/channeltx/modam/ammodgui.ui
@@ -314,7 +314,7 @@
          <string>Audio input gain</string>
         </property>
         <property name="maximum">
-         <number>100</number>
+         <number>20</number>
         </property>
         <property name="pageStep">
          <number>1</number>
diff --git a/plugins/channeltx/modam/ammodplugin.cpp b/plugins/channeltx/modam/ammodplugin.cpp
index 01890cf87..d02f929ed 100644
--- a/plugins/channeltx/modam/ammodplugin.cpp
+++ b/plugins/channeltx/modam/ammodplugin.cpp
@@ -23,7 +23,7 @@
 
 const PluginDescriptor AMModPlugin::m_pluginDescriptor = {
     QString("AM Modulator"),
-    QString("2.5.0"),
+    QString("2.5.1"),
     QString("(c) Edouard Griffiths, F4EXB"),
     QString("https://github.com/f4exb/sdrangel"),
     true,
diff --git a/plugins/channeltx/modnfm/nfmmod.h b/plugins/channeltx/modnfm/nfmmod.h
index e57368fcb..9cc54cfa0 100644
--- a/plugins/channeltx/modnfm/nfmmod.h
+++ b/plugins/channeltx/modnfm/nfmmod.h
@@ -219,7 +219,7 @@ private:
         bool getAudioMute() const { return m_audioMute; }
         bool getPlayLoop() const { return m_playLoop; }
 
-        static MsgConfigureNFMMod* create(Real rfBandwidth, Real afBandwidth, float fmDeviation, float toneFrequency, int volumeFactor, bool audioMute, bool playLoop)
+        static MsgConfigureNFMMod* create(Real rfBandwidth, Real afBandwidth, float fmDeviation, float toneFrequency, float volumeFactor, bool audioMute, bool playLoop)
         {
             return new MsgConfigureNFMMod(rfBandwidth, afBandwidth, fmDeviation, toneFrequency, volumeFactor, audioMute, playLoop);
         }
diff --git a/plugins/channeltx/modnfm/nfmmodgui.cpp b/plugins/channeltx/modnfm/nfmmodgui.cpp
index 6dcf5d7db..c75091ddc 100644
--- a/plugins/channeltx/modnfm/nfmmodgui.cpp
+++ b/plugins/channeltx/modnfm/nfmmodgui.cpp
@@ -95,6 +95,7 @@ QByteArray NFMModGUI::serialize() const
 	s.writeU32(5, m_channelMarker.getColor().rgb());
 	s.writeS32(6, ui->toneFrequency->value());
 	s.writeS32(7, ui->volume->value());
+    s.writeBlob(8, ui->cwKeyerGUI->serialize());
 	return s.final();
 }
 
@@ -135,6 +136,8 @@ bool NFMModGUI::deserialize(const QByteArray& data)
         ui->toneFrequency->setValue(tmp);
         d.readS32(7, &tmp, 10);
         ui->volume->setValue(tmp);
+        d.readBlob(8, &bytetmp);
+        ui->cwKeyerGUI->deserialize(bytetmp);
 
         blockApplySettings(false);
 		m_channelMarker.blockSignals(false);
diff --git a/plugins/channeltx/modnfm/nfmmodgui.ui b/plugins/channeltx/modnfm/nfmmodgui.ui
index bc40332b1..05841ab9f 100644
--- a/plugins/channeltx/modnfm/nfmmodgui.ui
+++ b/plugins/channeltx/modnfm/nfmmodgui.ui
@@ -354,7 +354,7 @@
          <string>Audio input gain</string>
         </property>
         <property name="maximum">
-         <number>100</number>
+         <number>20</number>
         </property>
         <property name="pageStep">
          <number>1</number>
diff --git a/plugins/channeltx/modnfm/nfmmodplugin.cpp b/plugins/channeltx/modnfm/nfmmodplugin.cpp
index 20c7aaf33..4b081b28c 100644
--- a/plugins/channeltx/modnfm/nfmmodplugin.cpp
+++ b/plugins/channeltx/modnfm/nfmmodplugin.cpp
@@ -23,7 +23,7 @@
 
 const PluginDescriptor NFMModPlugin::m_pluginDescriptor = {
     QString("NFM Modulator"),
-    QString("2.5.0"),
+    QString("2.5.1"),
     QString("(c) Edouard Griffiths, F4EXB"),
     QString("https://github.com/f4exb/sdrangel"),
     true,