diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp
index d9673d3a7..f2b177d0a 100644
--- a/src/blackcore/airspacemonitor.cpp
+++ b/src/blackcore/airspacemonitor.cpp
@@ -634,7 +634,7 @@ namespace BlackCore
         {
             static const QString readyForMatching("Ready for matching callsign '%1' with model type '%2', '%3'");
 
-            readiness.setFlag(ReadyForMatchingSent); // stored as readiness is reference
+            readiness.setFlag(ReadyForMatchingSent); // stored as readiness as reference
 
             const QString readyMsg = readyForMatching.arg(callsign.toQString(), remoteAircraft.getModel().getModelTypeAsString(), readiness.toQString());
             const CStatusMessage m = CLogUtilities::logMessage(callsign, readyMsg, getLogCategories());
diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp
index aa2fb4133..de7a2d27f 100644
--- a/src/blackgui/components/flightplancomponent.cpp
+++ b/src/blackgui/components/flightplancomponent.cpp
@@ -121,24 +121,24 @@ namespace BlackGui
             // ui->pte_RemarksGenerated->installEventFilter(ef);
 
             // connect
-            connect(ui->pb_Send,  &QPushButton::pressed, this, &CFlightPlanComponent::sendFlightPlan, Qt::QueuedConnection);
+            connect(ui->pb_Send,     &QPushButton::pressed, this, &CFlightPlanComponent::sendFlightPlan, Qt::QueuedConnection);
             connect(ui->pb_Download, &QPushButton::pressed, this, &CFlightPlanComponent::loadFlightPlanFromNetwork, Qt::QueuedConnection);
-            connect(ui->pb_Reset, &QPushButton::pressed, this, &CFlightPlanComponent::resetFlightPlan, Qt::QueuedConnection);
-            connect(ui->pb_ValidateFlightPlan, &QPushButton::pressed, this, &CFlightPlanComponent::validateFlightPlan, Qt::QueuedConnection);
-            connect(ui->tb_SyncWithSimulator, &QPushButton::released, this, &CFlightPlanComponent::syncWithSimulator,  Qt::QueuedConnection);
-            connect(ui->pb_Prefill,  &QPushButton::pressed, this, &CFlightPlanComponent::anticipateValues,  Qt::QueuedConnection);
-            connect(ui->pb_SimBrief, &QPushButton::pressed, this, &CFlightPlanComponent::loadFromSimBrief, Qt::QueuedConnection);
+            connect(ui->pb_Reset,    &QPushButton::pressed, this, &CFlightPlanComponent::resetFlightPlan, Qt::QueuedConnection);
+            connect(ui->pb_ValidateFlightPlan, &QPushButton::pressed,  this, &CFlightPlanComponent::validateFlightPlan, Qt::QueuedConnection);
+            connect(ui->tb_SyncWithSimulator,  &QPushButton::released, this, &CFlightPlanComponent::syncWithSimulator,  Qt::QueuedConnection);
+            connect(ui->pb_Prefill,            &QPushButton::pressed,  this, &CFlightPlanComponent::anticipateValues, Qt::QueuedConnection);
+            connect(ui->pb_SimBrief,           &QPushButton::pressed,  this, &CFlightPlanComponent::loadFromSimBrief, Qt::QueuedConnection);
 
             connect(ui->cb_VoiceCapabilities,          &QComboBox::currentTextChanged, this, &CFlightPlanComponent::currentTextChangedToBuildRemarks, Qt::QueuedConnection);
             connect(ui->cb_VoiceCapabilities,          &QComboBox::currentTextChanged, this, &CFlightPlanComponent::syncVoiceComboBoxes, Qt::QueuedConnection);
             connect(ui->cb_VoiceCapabilitiesFirstPage, &QComboBox::currentTextChanged, this, &CFlightPlanComponent::syncVoiceComboBoxes, Qt::QueuedConnection);
-            connect(ui->cb_NavigationEquipment, &QComboBox::currentTextChanged, this, &CFlightPlanComponent::currentTextChangedToBuildRemarks, Qt::QueuedConnection);
-            connect(ui->cb_PerformanceCategory, &QComboBox::currentTextChanged, this, &CFlightPlanComponent::currentTextChangedToBuildRemarks, Qt::QueuedConnection);
-            connect(ui->cb_PilotRating, &QComboBox::currentTextChanged, this, &CFlightPlanComponent::currentTextChangedToBuildRemarks, Qt::QueuedConnection);
+            connect(ui->cb_NavigationEquipment,        &QComboBox::currentTextChanged, this, &CFlightPlanComponent::currentTextChangedToBuildRemarks, Qt::QueuedConnection);
+            connect(ui->cb_PerformanceCategory,        &QComboBox::currentTextChanged, this, &CFlightPlanComponent::currentTextChangedToBuildRemarks, Qt::QueuedConnection);
+            connect(ui->cb_PilotRating,                &QComboBox::currentTextChanged, this, &CFlightPlanComponent::currentTextChangedToBuildRemarks, Qt::QueuedConnection);
             connect(ui->cb_RequiredNavigationPerformance, &QComboBox::currentTextChanged, this, &CFlightPlanComponent::currentTextChangedToBuildRemarks, Qt::QueuedConnection);
 
-            connect(ui->pb_LoadDisk, &QPushButton::clicked, this, &CFlightPlanComponent::loadFromDisk);
-            connect(ui->pb_SaveDisk, &QPushButton::clicked, this, &CFlightPlanComponent::saveToDisk);
+            connect(ui->pb_LoadDisk, &QPushButton::clicked, this, &CFlightPlanComponent::loadFromDisk, Qt::QueuedConnection);
+            connect(ui->pb_SaveDisk, &QPushButton::clicked, this, &CFlightPlanComponent::saveToDisk,   Qt::QueuedConnection);
 
             connect(ui->le_AircraftRegistration, &QLineEdit::textChanged, this, &CFlightPlanComponent::buildRemarksString, Qt::QueuedConnection);
             connect(ui->le_AirlineOperator,      &QLineEdit::textChanged, this, &CFlightPlanComponent::buildRemarksString, Qt::QueuedConnection);