diff --git a/plugins/channel/chanalyzer/chanalyzergui.cpp b/plugins/channel/chanalyzer/chanalyzergui.cpp
index e160eaaf4..d7305f5a0 100644
--- a/plugins/channel/chanalyzer/chanalyzergui.cpp
+++ b/plugins/channel/chanalyzer/chanalyzergui.cpp
@@ -308,7 +308,7 @@ ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, QWidget* parent) :
 	m_doApplySettings(true),
 	m_rate(6000),
 	m_spanLog2(3),
-	m_channelPowerDbAvg(20,0)
+	m_channelPowerDbAvg(40,0)
 {
 	ui->setupUi(this);
 	setAttribute(Qt::WA_DeleteOnClose, true);
diff --git a/plugins/channel/nfm/nfmdemod.h b/plugins/channel/nfm/nfmdemod.h
index 90818a678..524362656 100644
--- a/plugins/channel/nfm/nfmdemod.h
+++ b/plugins/channel/nfm/nfmdemod.h
@@ -64,7 +64,7 @@ public:
 		m_ctcssIndexSelected = selectedCtcssIndex;
 	}
 
-	Real getMagSq() const { return m_magsq; }
+	Real getMagSq() { return m_AGC.getAverage(); }
 
 private:
 	class MsgConfigureNFMDemod : public Message {
diff --git a/plugins/channel/nfm/nfmdemodgui.ui b/plugins/channel/nfm/nfmdemodgui.ui
index 76b6416d5..b29163427 100644
--- a/plugins/channel/nfm/nfmdemodgui.ui
+++ b/plugins/channel/nfm/nfmdemodgui.ui
@@ -370,13 +370,23 @@
         </property>
        </widget>
       </item>
+      <item>
+       <spacer name="ctcssSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </item>
    </layout>
   </widget>
-  <zorder>settingsContainer</zorder>
-  <zorder>horizontalLayoutWidget_2</zorder>
-  <zorder>horizontalLayoutWidget_2</zorder>
  </widget>
  <customwidgets>
   <customwidget>