diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp
index 45b046e86..0edae38ba 100644
--- a/src/blackcore/simulator.cpp
+++ b/src/blackcore/simulator.cpp
@@ -737,10 +737,10 @@ namespace BlackCore
 
     void ISimulator::initSimulatorInternals()
     {
-        const CSimulatorSettings s = this->getSimulatorSettings();
+        const CSpecializedSimulatorSettings s = this->getSimulatorSettings();
         m_simulatorInternals.setSimulatorName(this->getSimulatorName());
         m_simulatorInternals.setSwiftPluginName(this->getSimulatorPluginInfo().toQString());
-        m_simulatorInternals.setSimulatorInstallationDirectory(s.getSimulatorDirectory());
+        m_simulatorInternals.setSimulatorInstallationDirectory(s.getSimulatorDirectoryOrDefault());
     }
 
     void ISimulator::rememberElevationAndCG(const CCallsign &callsign, const QString &modelString, const Geo::CElevationPlane &elevation, const CLength &cg)
diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h
index 9522d2b12..89a65b0eb 100644
--- a/src/blackcore/simulator.h
+++ b/src/blackcore/simulator.h
@@ -182,7 +182,7 @@ namespace BlackCore
         void reloadWeatherSettings();
 
         //! Settings for current simulator
-        BlackMisc::Simulation::Settings::CSimulatorSettings getSimulatorSettings() const { return m_settings.getSettings(this->getSimulatorInfo()); }
+        BlackMisc::Simulation::Settings::CSpecializedSimulatorSettings getSimulatorSettings() const { return m_settings.getSpecializedSettings(this->getSimulatorInfo()); }
 
         //! Driver will be unloaded
         virtual void unload();
diff --git a/src/blackmisc/simulation/settings/simulatorsettings.h b/src/blackmisc/simulation/settings/simulatorsettings.h
index af5614c66..51ad80161 100644
--- a/src/blackmisc/simulation/settings/simulatorsettings.h
+++ b/src/blackmisc/simulation/settings/simulatorsettings.h
@@ -126,13 +126,16 @@ namespace BlackMisc
                 //! Ctor
                 CSpecializedSimulatorSettings(const QString &simulatorDir, const CSimulatorInfo &simulator) : m_genericSettings(CSimulatorSettings(simulatorDir)), m_simulator(simulator) {}
 
+                //! The generic settings
+                const CSimulatorSettings &getSimulatorSettings() const { return m_genericSettings; }
+
                 //! Default simulator path per simulator
                 const QString &getDefaultSimulatorDirectory() const;
 
                 //! Simulator directory or empty if default dir
                 const QString &getSimulatorDirectoryIfNotDefault() const;
 
-                //! Simulator directory or default model path
+                //! Simulator directory or default path
                 const QString &getSimulatorDirectoryOrDefault() const;
 
                 //! Model directories or default