diff --git a/src/blackgui/components/aircraftpartshistory.cpp b/src/blackgui/components/aircraftpartshistory.cpp
index 5ce6458eb..4684a4021 100644
--- a/src/blackgui/components/aircraftpartshistory.cpp
+++ b/src/blackgui/components/aircraftpartshistory.cpp
@@ -86,7 +86,7 @@ namespace BlackGui
         void CAircraftPartsHistory::updatePartsHistory()
         {
             if (!this->hasContexts()) { return; }
-            if (!this->isVisible()) { return; }
+            if (!this->isVisible())   { return; }
             const CCallsign cs(ui->comp_CallsignCompleter->getCallsign());
             if (cs.isEmpty()) { return; } // no or invalid callsign
             const auto currentAircraftParts = sGui->getIContextNetwork()->getRemoteAircraftParts(cs).frontOrDefault();
diff --git a/src/blackgui/components/dbloadoverviewcomponent.cpp b/src/blackgui/components/dbloadoverviewcomponent.cpp
index 3d6e43b5d..a125baf30 100644
--- a/src/blackgui/components/dbloadoverviewcomponent.cpp
+++ b/src/blackgui/components/dbloadoverviewcomponent.cpp
@@ -47,24 +47,24 @@ namespace BlackGui
             ui->lbl_SharedUrls->setTextInteractionFlags(Qt::TextBrowserInteraction);
             ui->lbl_SharedUrls->setOpenExternalLinks(true);
 
-            connect(ui->tb_DbReloadAircraft, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshDbPressed);
-            connect(ui->tb_DbReloadAirlines, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshDbPressed);
-            connect(ui->tb_DbReloadAirports, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshDbPressed);
-            connect(ui->tb_DbReloadCountries, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshDbPressed);
-            connect(ui->tb_DbReloadLiveries, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshDbPressed);
-            connect(ui->tb_DbReloadModels, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshDbPressed);
+            connect(ui->tb_DbReloadAircraft,     &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshDbPressed);
+            connect(ui->tb_DbReloadAirlines,     &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshDbPressed);
+            connect(ui->tb_DbReloadAirports,     &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshDbPressed);
+            connect(ui->tb_DbReloadCountries,    &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshDbPressed);
+            connect(ui->tb_DbReloadLiveries,     &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshDbPressed);
+            connect(ui->tb_DbReloadModels,       &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshDbPressed);
             connect(ui->tb_DbReloadDistributors, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshDbPressed);
 
-            connect(ui->tb_SharedReloadAircraft, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshSharedPressed);
-            connect(ui->tb_SharedReloadAirlines, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshSharedPressed);
-            connect(ui->tb_SharedReloadAirports, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshSharedPressed);
-            connect(ui->tb_SharedReloadCountries, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshSharedPressed);
-            connect(ui->tb_SharedReloadLiveries, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshSharedPressed);
-            connect(ui->tb_SharedReloadModels, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshSharedPressed);
+            connect(ui->tb_SharedReloadAircraft,     &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshSharedPressed);
+            connect(ui->tb_SharedReloadAirlines,     &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshSharedPressed);
+            connect(ui->tb_SharedReloadAirports,     &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshSharedPressed);
+            connect(ui->tb_SharedReloadCountries,    &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshSharedPressed);
+            connect(ui->tb_SharedReloadLiveries,     &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshSharedPressed);
+            connect(ui->tb_SharedReloadModels,       &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshSharedPressed);
             connect(ui->tb_SharedReloadDistributors, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshSharedPressed);
 
-            connect(ui->pb_LoadAllFromDB, &QPushButton::pressed, this, &CDbLoadOverviewComponent::loadAllFromDb);
-            connect(ui->pb_LoadAllFromShared, &QPushButton::pressed, this, &CDbLoadOverviewComponent::loadAllFromShared);
+            connect(ui->pb_LoadAllFromDB,        &QPushButton::pressed, this, &CDbLoadOverviewComponent::loadAllFromDb);
+            connect(ui->pb_LoadAllFromShared,    &QPushButton::pressed, this, &CDbLoadOverviewComponent::loadAllFromShared);
             connect(ui->pb_LoadAllFromResources, &QPushButton::pressed, this, &CDbLoadOverviewComponent::loadAllFromResourceFiles);
 
             if (sGui->hasWebDataServices())
diff --git a/src/blackgui/components/dbloadoverviewcomponent.h b/src/blackgui/components/dbloadoverviewcomponent.h
index ae2fa6beb..9b448d401 100644
--- a/src/blackgui/components/dbloadoverviewcomponent.h
+++ b/src/blackgui/components/dbloadoverviewcomponent.h
@@ -12,10 +12,11 @@
 #ifndef BLACKGUI_COMPONENTS_DBLOADOVERVIEWCOMPONENT_H
 #define BLACKGUI_COMPONENTS_DBLOADOVERVIEWCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
 #include "blackgui/loadindicator.h"
+#include "blackgui/blackguiexport.h"
 #include "blackmisc/digestsignal.h"
 #include "blackmisc/network/entityflags.h"
+
 #include <QFrame>
 #include <QScopedPointer>
 
diff --git a/src/blackgui/components/settingshotkeycomponent.cpp b/src/blackgui/components/settingshotkeycomponent.cpp
index ba3038a1a..a73983538 100644
--- a/src/blackgui/components/settingshotkeycomponent.cpp
+++ b/src/blackgui/components/settingshotkeycomponent.cpp
@@ -47,8 +47,8 @@ namespace BlackGui
             ui->setupUi(this);
             ui->tv_Hotkeys->setModel(&m_model);
 
-            connect(ui->pb_AddHotkey, &QPushButton::clicked, this, &CSettingsHotkeyComponent::addEntry);
-            connect(ui->pb_EditHotkey, &QPushButton::clicked, this, &CSettingsHotkeyComponent::editEntry);
+            connect(ui->pb_AddHotkey,    &QPushButton::clicked, this, &CSettingsHotkeyComponent::addEntry);
+            connect(ui->pb_EditHotkey,   &QPushButton::clicked, this, &CSettingsHotkeyComponent::editEntry);
             connect(ui->pb_RemoveHotkey, &QPushButton::clicked, this, &CSettingsHotkeyComponent::removeEntry);
             connect(ui->tb_ReloadHotkey, &QPushButton::clicked, this, &CSettingsHotkeyComponent::reloadHotkeysFromSettings);
 
@@ -176,6 +176,7 @@ namespace BlackGui
         CIdentifierList CSettingsHotkeyComponent::getAllIdentifiers() const
         {
             CIdentifierList identifiers;
+            if (!sGui) { return identifiers; }
             if (sGui->getIContextApplication()) { identifiers = sGui->getIContextApplication()->getRegisteredApplications(); }
 
             // add local application