diff --git a/src/blackcore/airspaceanalyzer.cpp b/src/blackcore/airspaceanalyzer.cpp
index d048f3ee6..ecd467af1 100644
--- a/src/blackcore/airspaceanalyzer.cpp
+++ b/src/blackcore/airspaceanalyzer.cpp
@@ -85,7 +85,7 @@ namespace BlackCore
 
     void CAirspaceAnalyzer::gracefulShutdown()
     {
-        bool s = QMetaObject::invokeMethod(&m_timer, "stop");
+        const bool s = QMetaObject::invokeMethod(&m_timer, "stop");
         Q_ASSERT_X(s, Q_FUNC_INFO, "invoke failed");
         Q_UNUSED(s);
     }
diff --git a/src/blackgui/menus/menuaction.h b/src/blackgui/menus/menuaction.h
index 9fc65067e..0104fae75 100644
--- a/src/blackgui/menus/menuaction.h
+++ b/src/blackgui/menus/menuaction.h
@@ -137,6 +137,7 @@ namespace BlackGui
             static const QString &pathStashEditor()  { static const QString p("Custom.13.Stash/Editor"); return p; }
 
             //! vPilot data
+            //! \deprecated vPilot functionality likely to be removed in the future
             static const QString &pathVPilot()  { static const QString p("Custom.14.vPilot/vPilot"); return p; }
 
             //! Log functionality
diff --git a/src/plugins/simulator/fs9/directplaypeer.h b/src/plugins/simulator/fs9/directplaypeer.h
index 1197fcc4b..d85d00f94 100644
--- a/src/plugins/simulator/fs9/directplaypeer.h
+++ b/src/plugins/simulator/fs9/directplaypeer.h
@@ -63,7 +63,7 @@ namespace BlackSimPlugin
             HRESULT directPlayMessageHandler(DWORD messageId, void *msgBuffer);
 
             //! Initialize DirectPlay
-            HRESULT     initDirectPlay();
+            HRESULT initDirectPlay();
 
             //! Returns true of the service provider is a valid on this machine
             bool isServiceProviderValid(const GUID *pGuidSP);
diff --git a/src/swiftdata/swiftdata.cpp b/src/swiftdata/swiftdata.cpp
index 186eaa0bd..2d752ad0e 100644
--- a/src/swiftdata/swiftdata.cpp
+++ b/src/swiftdata/swiftdata.cpp
@@ -109,10 +109,7 @@ void CSwiftData::init()
     const CGlobalSetup s(sApp->getGlobalSetup());
     if (!s.getDbHomePageUrl().isEmpty())
     {
-        QString t(this->windowTitle());
-        t += " ";
-        t += s.getDbHomePageUrl().toQString(true);
-        this->setWindowTitle(t);
+        this->setWindowTitle(QString("%1 %2").arg(this->windowTitle(), s.getDbHomePageUrl().toQString(true)));
     }
 
     sGui->triggerNewVersionCheck(10 * 1000);
@@ -158,7 +155,7 @@ void CSwiftData::performGracefulShutdown()
 
 void CSwiftData::consolidationSettingChanged()
 {
-    int consolidationSecs = m_consolidationSettings.get();
+    const int consolidationSecs = m_consolidationSettings.get();
     if (consolidationSecs < 0)
     {
         if (m_updater)