diff --git a/src/blackgui/components/aboutdialog.h b/src/blackgui/components/aboutdialog.h
index f3cc3ea27..dbcb0dd15 100644
--- a/src/blackgui/components/aboutdialog.h
+++ b/src/blackgui/components/aboutdialog.h
@@ -31,7 +31,7 @@ namespace BlackGui
             explicit CAboutDialog(QWidget *parent = nullptr);
 
             //! Destructor
-            virtual ~CAboutDialog();
+            virtual ~CAboutDialog() override;
 
         private:
             //! Init values
diff --git a/src/blackgui/components/aircraftmodelvalidationcomponent.cpp b/src/blackgui/components/aircraftmodelvalidationcomponent.cpp
index 92707259a..cec9e47f4 100644
--- a/src/blackgui/components/aircraftmodelvalidationcomponent.cpp
+++ b/src/blackgui/components/aircraftmodelvalidationcomponent.cpp
@@ -40,7 +40,6 @@ namespace BlackGui
 
             // 1st init when running in distributed environment
             QPointer<CAircraftModelValidationComponent> myself(this);
-
             const qint64 lastResults = m_lastResults;
             QTimer::singleShot(2500, this, [ = ]
             {
diff --git a/src/blackgui/components/aircraftmodelvalidationcomponent.h b/src/blackgui/components/aircraftmodelvalidationcomponent.h
index 69f265ea1..8d7921a7c 100644
--- a/src/blackgui/components/aircraftmodelvalidationcomponent.h
+++ b/src/blackgui/components/aircraftmodelvalidationcomponent.h
@@ -46,7 +46,7 @@ namespace BlackGui
             explicit CAircraftModelValidationComponent(QWidget *parent = nullptr);
 
             //! Destructor
-            virtual ~CAircraftModelValidationComponent();
+            virtual ~CAircraftModelValidationComponent() override;
 
             //! Validated a model set
             void validatedModelSet(const BlackMisc::Simulation::CSimulatorInfo &simulator, const BlackMisc::Simulation::CAircraftModelList &valid, const BlackMisc::Simulation::CAircraftModelList &invalid, bool stopped, const BlackMisc::CStatusMessageList &msgs);
diff --git a/src/blackgui/components/audiocomponent.h b/src/blackgui/components/audiocomponent.h
index caef20d00..30e0f1394 100644
--- a/src/blackgui/components/audiocomponent.h
+++ b/src/blackgui/components/audiocomponent.h
@@ -17,8 +17,6 @@
 #include <QObject>
 #include <QScopedPointer>
 
-class QWidget;
-
 namespace Ui { class CAudioComponent; }
 namespace BlackGui
 {
@@ -34,7 +32,7 @@ namespace BlackGui
             explicit CAudioComponent(QWidget *parent = nullptr);
 
             //! Destructor
-            virtual ~CAudioComponent();
+            virtual ~CAudioComponent() override;
 
         private:
             QScopedPointer<Ui::CAudioComponent> ui;
diff --git a/src/blackgui/components/dbquickmappingwizard.cpp b/src/blackgui/components/dbquickmappingwizard.cpp
index ee29ac56a..ad317fcbf 100644
--- a/src/blackgui/components/dbquickmappingwizard.cpp
+++ b/src/blackgui/components/dbquickmappingwizard.cpp
@@ -59,16 +59,6 @@ namespace BlackGui
 
             // init if data already available
             this->onWebDataRead();
-
-            /**
-            //! \todo remove this block when no longer needed after 2019-02
-            //! \fixme hardcoded stylesheet setting per stylesheet does NOT work, this hardcoded stuff should be removed
-            const QString style("background-image: url(:/textures/icons/textures/texture-inner.jpg)");
-            ui->wp2_Aircraft->setStyleSheet(style);
-            ui->wp3_LiveryColor->setStyleSheet(style);
-            ui->wp4_Livery->setStyleSheet(style);
-            ui->wp5_Distributor->setStyleSheet(style);
-            **/
         }
 
         CDbQuickMappingWizard::~CDbQuickMappingWizard()
diff --git a/src/blackgui/components/infobarstatuscomponent.cpp b/src/blackgui/components/infobarstatuscomponent.cpp
index dd04c1742..7319372e7 100644
--- a/src/blackgui/components/infobarstatuscomponent.cpp
+++ b/src/blackgui/components/infobarstatuscomponent.cpp
@@ -30,6 +30,7 @@
 #include <Qt>
 #include <QtGlobal>
 #include <QPointer>
+#include <QStringBuilder>
 #include <QTimer>
 
 using namespace BlackConfig;
@@ -154,7 +155,7 @@ namespace BlackGui
             {
                 // at least connected
                 const QString s(
-                    sGui->getIContextSimulator()->getSimulatorPluginInfo().getDescription() + ": " +
+                    sGui->getIContextSimulator()->getSimulatorPluginInfo().getDescription() % u": " %
                     ISimulator::statusToString(simStatus)
                 );
 
@@ -197,7 +198,7 @@ namespace BlackGui
                 break;
             case INetwork::Connected:
                 ui->led_Network->setOn(true);
-                ui->led_Network->setOnToolTip("Connected: " + sGui->getIContextNetwork()->getConnectedServer().getName());
+                ui->led_Network->setOnToolTip(u"Connected: " % sGui->getIContextNetwork()->getConnectedServer().getName());
                 break;
             case INetwork::Connecting:
                 ui->led_Network->setTriStateColor(CLedWidget::Yellow);
diff --git a/src/blackgui/pluginselector.h b/src/blackgui/pluginselector.h
index 63c688877..54a5704a9 100644
--- a/src/blackgui/pluginselector.h
+++ b/src/blackgui/pluginselector.h
@@ -52,7 +52,6 @@ namespace BlackGui
         //! Enables/disabled the given plugin.
         void setEnabled(const QString &identifier, bool enabled);
 
-
     private:
         void handlePluginStateChange();
 
diff --git a/src/blackgui/showhidebar.h b/src/blackgui/showhidebar.h
index 40938f2c2..9aba428db 100644
--- a/src/blackgui/showhidebar.h
+++ b/src/blackgui/showhidebar.h
@@ -16,8 +16,6 @@
 #include <QObject>
 #include <QScopedPointer>
 
-class QWidget;
-
 namespace Ui { class CShowHideBar; }
 namespace BlackGui
 {