diff --git a/src/blackcore/context_audio_impl.cpp b/src/blackcore/context_audio_impl.cpp
index 2c8fcb70e..ad87d5ba1 100644
--- a/src/blackcore/context_audio_impl.cpp
+++ b/src/blackcore/context_audio_impl.cpp
@@ -195,7 +195,10 @@ namespace BlackCore
 
     void CContextAudio::setVolumes(int com1Volume, int com2Volume)
     {
-        if (m_channelCom1->getVolume() == com1Volume && m_channelCom2->getVolume() == com2Volume) { return; }
+        //! \todo Fix when VATLIB 2.0 is available
+        int channelV1 = static_cast<int>(m_channelCom1->getVolume());
+        int channelV2 = static_cast<int>(m_channelCom2->getVolume());
+        if (channelV1 == com1Volume && channelV2 == com2Volume) { return; }
 
         bool enable1 = com1Volume > 0;
         bool enable2 = com2Volume > 0;
diff --git a/src/blackcore/context_simulator_impl.h b/src/blackcore/context_simulator_impl.h
index e753deeed..570367152 100644
--- a/src/blackcore/context_simulator_impl.h
+++ b/src/blackcore/context_simulator_impl.h
@@ -145,7 +145,7 @@ namespace BlackCore
         BlackCore::ISimulator *m_simulator = nullptr;
 
         QTimer *m_updateTimer = nullptr;
-        QDir m_pluginsDir     = nullptr;
+        QDir m_pluginsDir;
         QSet<ISimulatorFactory *> m_simulatorFactories;
         QFuture<bool> m_canConnectResult;
     };
diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp
index 5abfa928c..570e08c59 100644
--- a/src/blackgui/components/logincomponent.cpp
+++ b/src/blackgui/components/logincomponent.cpp
@@ -183,6 +183,9 @@ namespace BlackGui
                 case INetwork::LoginAsObserver:
                     CLogMessage(this).info("login in observer mode");
                     break;
+                case INetwork::LoginNormal:
+                default:
+                    break;
                 }
 
                 // Server
diff --git a/src/blackgui/led.cpp b/src/blackgui/led.cpp
index f7cae1fd4..c6f4a0bc1 100644
--- a/src/blackgui/led.cpp
+++ b/src/blackgui/led.cpp
@@ -226,7 +226,7 @@ namespace BlackGui
 
     void CLedWidget::toggleValue()
     {
-        m_value = (m_value == Off) ? m_value = On : m_value = Off;
+        m_value = (m_value == Off) ? On : Off;
         setLed();
     }
 
diff --git a/src/blackgui/loginmodebuttons.h b/src/blackgui/loginmodebuttons.h
index 31d8701b0..9f2b5b9ca 100644
--- a/src/blackgui/loginmodebuttons.h
+++ b/src/blackgui/loginmodebuttons.h
@@ -21,7 +21,7 @@ namespace Ui { class CLoginModeButtons; }
 
 namespace BlackGui
 {
-
+    //! Display login modes (normal, stealth, ...)
     class CLoginModeButtons : public QGroupBox
     {
         Q_OBJECT
diff --git a/src/blackgui/uppercasevalidator.cpp b/src/blackgui/uppercasevalidator.cpp
index cbeaded06..7b2c6643f 100644
--- a/src/blackgui/uppercasevalidator.cpp
+++ b/src/blackgui/uppercasevalidator.cpp
@@ -19,7 +19,7 @@ namespace BlackGui
     { }
 
     CUpperCaseValidator::CUpperCaseValidator(bool optionalValue, int minLength, int maxLength, QObject *parent) : QValidator(parent),
-        m_minLength(minLength), m_maxLength(maxLength), m_optionalValue(optionalValue)
+        m_optionalValue(optionalValue), m_minLength(minLength), m_maxLength(maxLength)
     { }
 
     QValidator::State CUpperCaseValidator::validate(QString &input, int &pos) const
diff --git a/src/blackmisc/project.cpp b/src/blackmisc/project.cpp
index b0e3564fe..95910565d 100644
--- a/src/blackmisc/project.cpp
+++ b/src/blackmisc/project.cpp
@@ -160,7 +160,7 @@ namespace BlackMisc
 #ifdef Q_OS_WIN
         // QSysInfo::WindowsVersion only available on Win platforms
         return (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based) ? true : false;
-#elif
+#else
         return false;
 #endif
     }