diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp
index 460a680d9..39e30faa3 100644
--- a/src/blackcore/airspacemonitor.cpp
+++ b/src/blackcore/airspacemonitor.cpp
@@ -111,8 +111,8 @@ namespace BlackCore
         connect(m_analyzer, &CAirspaceAnalyzer::airspaceAircraftSnapshot, this, &CAirspaceMonitor::airspaceAircraftSnapshot, Qt::QueuedConnection);
 
         // Analyzer
-        connect(m_analyzer, &CAirspaceAnalyzer::timeoutAircraft, this, &CAirspaceMonitor::onPilotDisconnected, Qt::QueuedConnection);
-        connect(m_analyzer, &CAirspaceAnalyzer::timeoutAtc, this, &CAirspaceMonitor::onAtcControllerDisconnected, Qt::QueuedConnection);
+        connect(m_analyzer, &CAirspaceAnalyzer::timeoutAircraft, this, &CAirspaceMonitor::onPilotDisconnected,         Qt::QueuedConnection);
+        connect(m_analyzer, &CAirspaceAnalyzer::timeoutAtc,      this, &CAirspaceMonitor::onAtcControllerDisconnected, Qt::QueuedConnection);
     }
 
     bool CAirspaceMonitor::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositonUpdates)
@@ -725,7 +725,8 @@ namespace BlackCore
         const ReverseLookupLogging reverseLookupEnabled = this->isReverseLookupMessagesEnabled();
         CStatusMessageList reverseLookupMessages;
         CStatusMessageList *pReverseLookupMessages = reverseLookupEnabled.testFlag(RevLogEnabled) ? &reverseLookupMessages : nullptr;
-        CMatchingUtils::addLogDetailsToList(pReverseLookupMessages, callsign, QString("Data from network: aircraft '%1', airline '%2', livery '%3'").
+        CMatchingUtils::addLogDetailsToList(pReverseLookupMessages, callsign,
+                                            QStringLiteral("Data from network: aircraft '%1', airline '%2', livery '%3'").
                                             arg(aircraftIcaoDesignator, airlineIcaoDesignator, livery),
                                             CAirspaceMonitor::getLogCategories());
 
@@ -1112,10 +1113,12 @@ namespace BlackCore
     void CAirspaceMonitor::onAircraftConfigReceived(const CCallsign &callsign, const QJsonObject &jsonObject, qint64 currentOffsetMs)
     {
         Q_ASSERT(CThreadUtils::isCurrentThreadObjectThread(this));
-        this->storeAircraftParts(callsign, jsonObject, currentOffsetMs);
         BLACK_AUDIT_X(!callsign.isEmpty(), Q_FUNC_INFO, "Need callsign");
         if (callsign.isEmpty()) { return; }
 
+        // store parts
+        this->storeAircraftParts(callsign, jsonObject, currentOffsetMs);
+
         // update client capability
         CClient client = this->getClientOrDefaultForCallsign(callsign);
         client.setUserCallsign(callsign); // make valid by setting a callsign
diff --git a/src/blackcore/vatsim/networkvatlib.h b/src/blackcore/vatsim/networkvatlib.h
index 976843abd..891228551 100644
--- a/src/blackcore/vatsim/networkvatlib.h
+++ b/src/blackcore/vatsim/networkvatlib.h
@@ -46,7 +46,7 @@ class QCommandLineOption;
 
 namespace BlackMisc
 {
-    namespace Aviation { class CFlightPlan; }
+    namespace Aviation   { class CFlightPlan; }
     namespace Simulation { class CSimulatedAircraft; }
 }
 
@@ -308,7 +308,7 @@ namespace BlackCore
 
             BlackMisc::CSettingReadOnly<BlackCore::Vatsim::TRawFsdMessageSetting> m_fsdMessageSetting { this, &CNetworkVatlib::fsdMessageSettingsChanged };
             QFile m_rawFsdMessageLogFile;
-            bool m_rawFsdMessagesEnabled = false;
+            bool m_rawFsdMessagesEnabled   = false;
             bool m_filterPasswordFromLogin = false;
         };
     } //namespace
diff --git a/src/blackmisc/timestampobjectlist.cpp b/src/blackmisc/timestampobjectlist.cpp
index 90d49e80b..a47f32620 100644
--- a/src/blackmisc/timestampobjectlist.cpp
+++ b/src/blackmisc/timestampobjectlist.cpp
@@ -420,8 +420,8 @@ namespace BlackMisc
                 const ITimestampBased &l = last;
                 const ITimestampBased &o = object;
                 const qint64 diff = l.getAbsTimeDifferenceMs(o);
-                if (diff > mmm.max) { mmm.max  = diff; }
-                if (diff < mmm.min) { mmm.min = diff;  }
+                if (diff > mmm.max) { mmm.max = diff; }
+                if (diff < mmm.min) { mmm.min = diff; }
                 mean += diff;
             }
             c++;