diff --git a/src/core/application/applicationsettings.h b/src/core/application/applicationsettings.h
index 5bda23dc4..b16f1e149 100644
--- a/src/core/application/applicationsettings.h
+++ b/src/core/application/applicationsettings.h
@@ -102,7 +102,11 @@ namespace swift::core::application
         }
 
         //! \copydoc swift::misc::TSettingTrait::defaultValue
-        static const QStringList &defaultValue() { return QStringList {}; }
+        static const QStringList &defaultValue()
+        {
+            static const QStringList emptyList;
+            return emptyList;
+        }
     };
 } // namespace swift::core::application
 
diff --git a/src/gui/components/automodelsetcomponent.cpp b/src/gui/components/automodelsetcomponent.cpp
index 635cab0df..58913ce42 100644
--- a/src/gui/components/automodelsetcomponent.cpp
+++ b/src/gui/components/automodelsetcomponent.cpp
@@ -422,9 +422,9 @@ namespace swift::gui::components
 
         // loop for all enabled simulators
         CSimulatorInfo sims = this->m_enabledSimulators.get();
-        unsigned int number = 96;
+        unsigned int number = sims.toInt();
 
-        // Iteriere
+        // iterate
         // for (const auto &simInfo : number)
         //{
         //    m_simulator = simInfo;
@@ -435,7 +435,7 @@ namespace swift::gui::components
         for (int i = 0; i < totalBits; ++i)
         {
             if (number & (1u << i))
-            { // Prüfen, ob Bit i gesetzt ist
+            { // check, if bit i is set
                 m_simulator = std::pow(2.0, i);
                 this->createModelSet();
             }
diff --git a/src/misc/simulation/simulatorinfo.cpp b/src/misc/simulation/simulatorinfo.cpp
index a0571a2bb..39aa314cf 100644
--- a/src/misc/simulation/simulatorinfo.cpp
+++ b/src/misc/simulation/simulatorinfo.cpp
@@ -304,7 +304,7 @@ namespace swift::misc::simulation
         const bool xp = jxp.isBool() ? jxp.toBool() : CDatastoreUtility::dbBoolStringToBool(jxp.toString());
         const bool p3d = jp3d.isBool() ? jp3d.toBool() : CDatastoreUtility::dbBoolStringToBool(jp3d.toString());
         const bool fg = jfg.isBool() ? jfg.toBool() : CDatastoreUtility::dbBoolStringToBool(jfg.toString());
-        const bool msfs =
+        const bool msfs2020 =
             jmsfs2020.isBool() ? jmsfs2020.toBool() : CDatastoreUtility::dbBoolStringToBool(jmsfs2020.toString());
         const bool msfs2024 =
             jmsfs2024.isBool() ? jmsfs2024.toBool() : CDatastoreUtility::dbBoolStringToBool(jmsfs2024.toString());
diff --git a/src/misc/simulation/simulatorinfo.h b/src/misc/simulation/simulatorinfo.h
index cb2bedd8d..9e0aa2c2c 100644
--- a/src/misc/simulation/simulatorinfo.h
+++ b/src/misc/simulation/simulatorinfo.h
@@ -129,6 +129,8 @@ namespace swift::misc::simulation
         //! Number simulators selected
         int numberSimulators() const;
 
+        int toInt() const { return m_simulator; }
+
         //! Matches all simulators
         bool matchesAll(const CSimulatorInfo &otherInfo) const;
 
diff --git a/src/plugins/simulator/msfs2024/simulatormsfs2024common.cpp b/src/plugins/simulator/msfs2024/simulatormsfs2024common.cpp
index a35b1e16f..f93d9384d 100644
--- a/src/plugins/simulator/msfs2024/simulatormsfs2024common.cpp
+++ b/src/plugins/simulator/msfs2024/simulatormsfs2024common.cpp
@@ -502,13 +502,21 @@ namespace swift::simplugin::msfs2024common
 
             m_simulatorInfo = this->getSimulatorInfo();
 
-            bool givenDistributorsOnly = false;
-            bool dbDataOnly = false;
-            bool dbIcaoOnly = false;
-            bool incremnental = false;
-            bool sortByDistributor = true;
-            bool consolidateWithDb = false;
-            bool ShowAllInstalledModells = true; // msfs20424 always show all installed models
+            bool givenDistributorsOnly = true;
+            bool dbDataOnly = true;
+            bool dbIcaoOnly = true;
+            bool incremnental = true;
+            bool sortByDistributor = false;
+            bool consolidateWithDb = true;
+            bool ShowAllInstalledModells = false; // msfs20424 always show all installed models
+
+            givenDistributorsOnly = false;
+            dbDataOnly = false;
+            dbIcaoOnly = false;
+            incremnental = false;
+            sortByDistributor = true;
+            consolidateWithDb = false;
+            ShowAllInstalledModells = true; // msfs20424 always show all installed models
 
             if (gui_application)
             {