diff --git a/src/blackcore/audio/audiosettings.h b/src/blackcore/audio/audiosettings.h
index 0cf2594c8..36d05b4ac 100644
--- a/src/blackcore/audio/audiosettings.h
+++ b/src/blackcore/audio/audiosettings.h
@@ -25,9 +25,6 @@ namespace BlackCore
             //! \copydoc BlackMisc::TSettingTrait::key
             static const char *key() { return "audio/setup"; }
 
-            //! \copydoc BlackMisc::TSettingTrait::defaultValue
-            static const BlackMisc::Audio::CSettings &defaultValue() { static const BlackMisc::Audio::CSettings a; return a; }
-
             //! \copydoc BlackMisc::TSettingTrait::isValid
             static bool isValid(const BlackMisc::Audio::CSettings &value) { Q_UNUSED(value); return true; }
         };
diff --git a/src/blackgui/components/audiosetupcomponent.h b/src/blackgui/components/audiosetupcomponent.h
index fd53a801b..fe9c39215 100644
--- a/src/blackgui/components/audiosetupcomponent.h
+++ b/src/blackgui/components/audiosetupcomponent.h
@@ -29,8 +29,7 @@ namespace BlackGui
     namespace Components
     {
         //! Audio setup such as input / output devices
-        class BLACKGUI_EXPORT CAudioSetupComponent :
-            public QFrame
+        class BLACKGUI_EXPORT CAudioSetupComponent : public QFrame
         {
             Q_OBJECT
 
@@ -73,7 +72,6 @@ namespace BlackGui
 
             QScopedPointer<Ui::CAudioSetupComponent> ui;
             BlackMisc::CSetting<BlackCore::Audio::TSettings> m_audioSettings { this, &CAudioSetupComponent::ps_reloadSettings };
-
         };
     } // namespace
 } // namespace
diff --git a/src/blackgui/components/flightplancomponent.h b/src/blackgui/components/flightplancomponent.h
index e149d4282..ba324cb2d 100644
--- a/src/blackgui/components/flightplancomponent.h
+++ b/src/blackgui/components/flightplancomponent.h
@@ -9,8 +9,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_FLIGHTPLANCOMPONENT_H
-#define BLACKGUI_FLIGHTPLANCOMPONENT_H
+#ifndef BLACKGUI_COMPONENTS_FLIGHTPLANCOMPONENT_H
+#define BLACKGUI_COMPONENTS_FLIGHTPLANCOMPONENT_H
 
 #include "blackgui/blackguiexport.h"
 #include "blackmisc/aviation/flightplan.h"
@@ -29,7 +29,6 @@ class QWidget;
 
 namespace BlackMisc { namespace Simulation { class CSimulatedAircraft; } }
 namespace Ui { class CFlightPlanComponent; }
-
 namespace BlackGui
 {
     namespace Components
diff --git a/src/blackgui/menus/aircraftmodelmenus.cpp b/src/blackgui/menus/aircraftmodelmenus.cpp
index 9578970fc..376fbc13d 100644
--- a/src/blackgui/menus/aircraftmodelmenus.cpp
+++ b/src/blackgui/menus/aircraftmodelmenus.cpp
@@ -108,8 +108,8 @@ namespace BlackGui
             if (!model.hasFileName()) { return; }
             if (QFile::exists(model.getFileName()))
             {
-                const QString url("file:///" + model.getFileName());
-                QDesktopServices::openUrl(QUrl(url));
+                const QUrl url = QUrl::fromLocalFile(model.getFileName());
+                QDesktopServices::openUrl(url);
             }
         }
 
@@ -119,7 +119,7 @@ namespace BlackGui
             if (!mv->hasSingleSelectedRow()) { return; }
             const CAircraftModel model(mv->selectedObject());
             if (model.getIconPath().isEmpty()) { return; }
-            CStatusMessage msg;
+            CStatusMessage msg(this);
             const CPixmap pm(model.loadIcon(msg));
             if (msg.isSuccess())
             {
diff --git a/src/blackgui/overlaymessages.cpp b/src/blackgui/overlaymessages.cpp
index 77008782e..8c4088a4a 100644
--- a/src/blackgui/overlaymessages.cpp
+++ b/src/blackgui/overlaymessages.cpp
@@ -52,6 +52,7 @@ namespace BlackGui
         ui(new Ui::COverlayMessages)
     {
         this->init(w, h);
+        this->showKillButton(false);
         connect(sGui, &CGuiApplication::styleSheetsChanged, this, &COverlayMessages::ps_onStyleSheetsChanged);
         connect(ui->pb_Ok, &QPushButton::clicked, this, &COverlayMessages::ps_okClicked);
         connect(ui->pb_Cancel, &QPushButton::clicked, this, &COverlayMessages::ps_cancelClicked);
@@ -325,6 +326,7 @@ namespace BlackGui
     {
         ui->sw_StatusMessagesComponent->setCurrentWidget(ui->pg_Image);
         this->setHeader("Image");
+        this->showKillButton(false);
     }
 
     void COverlayMessages::setConfirmationMessage(const QString &message)