diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h
index e96c31a34..e39040a05 100644
--- a/src/blackcore/simulator.h
+++ b/src/blackcore/simulator.h
@@ -552,18 +552,15 @@ namespace BlackCore
         int m_statsPhysicallyRemovedAircraft = 0; //!< statistics, how many aircraft removed
     };
 
-    //! Interface to a simulator listener.
-    //! The simulator listener is responsible for letting the core know when
-    //! the corresponding simulator is started.
+    //! \brief Interface to a simulator listener.
+    //! \details The simulator listener is responsible for letting the core know,
+    //!          when the corresponding simulator is started.
+    //! \note Will be moved to a background thread (context)
     class BLACKCORE_EXPORT ISimulatorListener : public QObject
     {
         Q_OBJECT
 
     public:
-        //! Constructor
-        //! \sa ISimulatorFactory::createListener().
-        ISimulatorListener(const BlackMisc::Simulation::CSimulatorPluginInfo &info);
-
         //! Destructor
         virtual ~ISimulatorListener() = default;
 
@@ -588,6 +585,10 @@ namespace BlackCore
         void simulatorStarted(const BlackMisc::Simulation::CSimulatorPluginInfo &info);
 
     protected:
+        //! Constructor
+        //! \sa ISimulatorFactory::createListener().
+        ISimulatorListener(const BlackMisc::Simulation::CSimulatorPluginInfo &info);
+
         //! Plugin specific implementation to start listener
         virtual void startImpl() = 0;
 
diff --git a/src/plugins/simulator/fsx/simulatorfsx.h b/src/plugins/simulator/fsx/simulatorfsx.h
index 8d7179782..84f449bb7 100644
--- a/src/plugins/simulator/fsx/simulatorfsx.h
+++ b/src/plugins/simulator/fsx/simulatorfsx.h
@@ -34,7 +34,7 @@ namespace BlackSimPlugin
         };
 
         //! Listener for FSX
-        class CSimulatorFsxListener : public BlackSimPlugin::FsxCommon::CSimulatorFsxCommonListener
+        class CSimulatorFsxListener : public FsxCommon::CSimulatorFsxCommonListener
         {
             Q_OBJECT
 
diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
index 38b214305..e36f67c13 100644
--- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
+++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
@@ -113,7 +113,7 @@ namespace BlackSimPlugin
                                 QObject *parent = nullptr);
 
             //! Destructor
-            virtual ~CSimulatorFsxCommon();
+            virtual ~CSimulatorFsxCommon() override;
 
             //! \name ISimulator implementations
             //! @{
@@ -516,7 +516,7 @@ namespace BlackSimPlugin
             bool checkSimConnectDll() const;
 
         private:
-            QTimer  m_timer;
+            QTimer  m_timer { this }; //!< timer, "this" is needed otherwise
             QString m_simulatorVersion;
             QString m_simConnectVersion;
             QString m_simulatorName;