diff --git a/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp b/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp
index 3628470c5..ba236e141 100644
--- a/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp
+++ b/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp
@@ -75,8 +75,12 @@ namespace BlackGui
 
         CAircraftIcaoCode CDbAircraftIcaoSelectorComponent::getAircraftIcao() const
         {
-            int key = CDatastoreUtility::extractIntegerKey(this->ui->le_Aircraft->text());
-            if (key < 0) { return CAircraftIcaoCode(); }
+            QString text(this->ui->le_Aircraft->text().trimmed().toUpper());
+            int key = CDatastoreUtility::extractIntegerKey(text);
+            if (key < 0)
+            {
+                return CAircraftIcaoCode(text);
+            }
             CAircraftIcaoCode icao(getAircraftIcaoCodeForDbKey(key));
             return icao;
         }
diff --git a/src/blackgui/components/dbdebugdatabasesetup.cpp b/src/blackgui/components/dbdebugdatabasesetup.cpp
index b8efe682c..0551f92b0 100644
--- a/src/blackgui/components/dbdebugdatabasesetup.cpp
+++ b/src/blackgui/components/dbdebugdatabasesetup.cpp
@@ -23,8 +23,16 @@ namespace BlackGui
             ui(new Ui::CDbDebugDatabaseSetup)
         {
             ui->setupUi(this);
-            this->setEnabled(CProject::isRunningInDeveloperEnvironment());
-            connect(ui->cb_EnableServerDebugging, &QCheckBox::toggled, this, &CDbDebugDatabaseSetup::ps_debugChanged);
+            bool enabled = CProject::isRunningInDeveloperEnvironment();
+            this->setEnabled(enabled);
+            if (!enabled)
+            {
+                this->setToolTip("Disabled, cannot be set!");
+            }
+            else
+            {
+                connect(ui->cb_EnableServerDebugging, &QCheckBox::toggled, this, &CDbDebugDatabaseSetup::ps_debugChanged);
+            }
         }
 
         CDbDebugDatabaseSetup::~CDbDebugDatabaseSetup()