diff --git a/src/blackcore/airspacemonitor.h b/src/blackcore/airspacemonitor.h
index cca6858c7..44194d014 100644
--- a/src/blackcore/airspacemonitor.h
+++ b/src/blackcore/airspacemonitor.h
@@ -76,12 +76,12 @@ namespace BlackCore
         Q_INTERFACES(BlackMisc::Simulation::IRemoteAircraftProvider)
 
     public:
-        //! Constructor
-        CAirspaceMonitor(BlackMisc::Simulation::IOwnAircraftProvider *ownAircraft, INetwork *network, QObject *parent);
-
         //! Log categories
         static const BlackMisc::CLogCategoryList &getLogCategories();
 
+        //! Constructor
+        CAirspaceMonitor(BlackMisc::Simulation::IOwnAircraftProvider *ownAircraft, INetwork *network, QObject *parent);
+
         //! \ingroup remoteaircraftprovider
         //! @{
         virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const override;
diff --git a/src/blackcore/context/contextnetworkimpl.h b/src/blackcore/context/contextnetworkimpl.h
index 633083689..d83016efa 100644
--- a/src/blackcore/context/contextnetworkimpl.h
+++ b/src/blackcore/context/contextnetworkimpl.h
@@ -236,7 +236,7 @@ namespace BlackCore
 
             //! Render restrictions have been changed, used with analyzer
             //! \sa CAirspaceAnalyzer
-            //! \ingroup crosscontextslot
+            //! \ingroup crosscontextfunction
             void xCtxSimulatorRenderRestrictionsChanged(bool restricted, bool enabled, int maxAircraft, const BlackMisc::PhysicalQuantities::CLength &maxRenderedDistance);
         };
     } // ns
diff --git a/src/blackcore/context/contextownaircraftimpl.h b/src/blackcore/context/contextownaircraftimpl.h
index 7ee59114a..e9131aecc 100644
--- a/src/blackcore/context/contextownaircraftimpl.h
+++ b/src/blackcore/context/contextownaircraftimpl.h
@@ -184,11 +184,11 @@ namespace BlackCore
             BlackMisc::CSetting<Vatsim::TCurrentTrafficServer> m_currentNetworkServer { this };
 
             //! Station has been changed, needed to tune in/out voice room
-            //! \ingroup crosscontextslot
+            //! \ingroup crosscontextfunction
             void xCtxChangedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &atcStation, bool connected);
 
             //! Simulator model has been changed
-            //! \ingroup crosscontextslot
+            //! \ingroup crosscontextfunction
             void xCtxChangedSimulatorModel(const BlackMisc::Simulation::CAircraftModel &model);
 
             //! Web data loaded
diff --git a/src/blackcore/context/contextsimulatorimpl.h b/src/blackcore/context/contextsimulatorimpl.h
index 400db5586..cbeb9c66d 100644
--- a/src/blackcore/context/contextsimulatorimpl.h
+++ b/src/blackcore/context/contextsimulatorimpl.h
@@ -143,7 +143,7 @@ namespace BlackCore
 
         private:
             //  ------------ slots connected with network or other contexts ---------
-            //! \ingroup crosscontextslot
+            //! \ingroup crosscontextfunction
             //! @{
 
             //! Remote aircraft added
diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp
index a64b73cc8..1469bd07e 100644
--- a/src/plugins/simulator/xplane/simulatorxplane.cpp
+++ b/src/plugins/simulator/xplane/simulatorxplane.cpp
@@ -221,9 +221,9 @@ namespace BlackSimPlugin
                     m_xplaneData.gearReployRatio > 0, static_cast<int>(m_xplaneData.flapsReployRatio * 100),
                     m_xplaneData.speedBrakeRatio > 0.5, engines, m_xplaneData.onGroundAll
                 };
-                updateOwnParts(parts);
 
-                requestRemoteAircraftDataFromXPlane();
+                this->updateOwnParts(parts);
+                this->requestRemoteAircraftDataFromXPlane();
             }
         }
 
@@ -250,8 +250,8 @@ namespace BlackSimPlugin
                 connect(m_trafficProxy, &CXSwiftBusTrafficProxy::simFrame, this, &CSimulatorXPlane::updateRemoteAircraft);
                 connect(m_trafficProxy, &CXSwiftBusTrafficProxy::remoteAircraftData, this, &CSimulatorXPlane::updateRemoteAircraftFromSimulator);
                 if (m_watcher) { m_watcher->setConnection(m_conn); }
-                loadCslPackages();
-                emitSimulatorCombinedStatus();
+                this->loadCslPackages();
+                this->emitSimulatorCombinedStatus();
                 return true;
             }
             else