diff --git a/plugins/channelrx/demodnfm/nfmdemod.cpp b/plugins/channelrx/demodnfm/nfmdemod.cpp
index fc376f765..efe32925d 100644
--- a/plugins/channelrx/demodnfm/nfmdemod.cpp
+++ b/plugins/channelrx/demodnfm/nfmdemod.cpp
@@ -23,13 +23,13 @@
 #include "SWGChannelSettings.h"
 #include "SWGNFMDemodSettings.h"
 
-#include <dsp/downchannelizer.h>
+#include "dsp/downchannelizer.h"
 #include "util/stepfunctions.h"
 #include "audio/audiooutput.h"
 #include "dsp/pidcontroller.h"
 #include "dsp/dspengine.h"
 #include "dsp/threadedbasebandsamplesink.h"
-#include <device/devicesourceapi.h>
+#include "device/devicesourceapi.h"
 
 #include "nfmdemodgui.h"
 #include "nfmdemod.h"
@@ -111,9 +111,11 @@ float arctan2(Real y, Real x)
 		Real r = (x + abs_y) / (abs_y - x);
 		angle = coeff_2 - coeff_1 * r;
 	}
-	if(y < 0)
+	if(y < 0) {
 		return(-angle);
-	else return(angle);
+	} else {
+	    return(angle);
+	}
 }
 
 Real angleDist(Real a, Real b)
@@ -410,7 +412,7 @@ void NFMDemod::applySettings(const NFMDemodSettings& settings, bool force)
     if ((settings.m_fmDeviation != m_settings.m_fmDeviation) ||
         (settings.m_rfBandwidth != m_settings.m_rfBandwidth) || force)
     {
-        m_phaseDiscri.setFMScaling((8.0f*settings.m_rfBandwidth) / (float) settings.m_fmDeviation); // integrate 4x factor
+        m_phaseDiscri.setFMScaling((8.0f*settings.m_rfBandwidth) / static_cast<float>(settings.m_fmDeviation)); // integrate 4x factor
     }
 
     if ((settings.m_afBandwidth != m_settings.m_afBandwidth) ||
diff --git a/plugins/channelrx/demodnfm/nfmdemod.h b/plugins/channelrx/demodnfm/nfmdemod.h
index 328bd9a84..7a9411f20 100644
--- a/plugins/channelrx/demodnfm/nfmdemod.h
+++ b/plugins/channelrx/demodnfm/nfmdemod.h
@@ -31,7 +31,6 @@
 #include "dsp/afsquelch.h"
 #include "dsp/agc.h"
 #include "dsp/ctcssdetector.h"
-#include "dsp/afsquelch.h"
 #include "audio/audiofifo.h"
 #include "util/message.h"
 
diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.cpp b/plugins/channelrx/demodnfm/nfmdemodgui.cpp
index ab7891e42..a2fad4346 100644
--- a/plugins/channelrx/demodnfm/nfmdemodgui.cpp
+++ b/plugins/channelrx/demodnfm/nfmdemodgui.cpp
@@ -261,7 +261,7 @@ NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
 	connect(this, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool)));
     connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &)));
 
-	m_nfmDemod = (NFMDemod*) rxChannel; //new NFMDemod(m_deviceUISet->m_deviceSourceAPI);
+	m_nfmDemod = reinterpret_cast<NFMDemod*>(rxChannel); //new NFMDemod(m_deviceUISet->m_deviceSourceAPI);
 	m_nfmDemod->setMessageQueueToGUI(getInputMessageQueue());
 
 	connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
diff --git a/plugins/channelrx/demodnfm/nfmdemodsettings.cpp b/plugins/channelrx/demodnfm/nfmdemodsettings.cpp
index 276d69950..e0c46d23c 100644
--- a/plugins/channelrx/demodnfm/nfmdemodsettings.cpp
+++ b/plugins/channelrx/demodnfm/nfmdemodsettings.cpp
@@ -65,7 +65,7 @@ QByteArray NFMDemodSettings::serialize() const
     s.writeS32(2, getRFBWIndex(m_rfBandwidth));
     s.writeS32(3, m_afBandwidth/1000.0);
     s.writeS32(4, m_volume*10.0);
-    s.writeS32(5, (int) m_squelch);
+    s.writeS32(5, static_cast<int>(m_squelch));
     s.writeU32(7, m_rgbColor);
     s.writeS32(8, m_ctcssIndex);
     s.writeBool(9, m_ctcssOn);