diff --git a/src/plugins/simulator/fs9/directplaypeer.cpp b/src/plugins/simulator/fs9/directplaypeer.cpp
index 8c0c797fa..9ed6e7efd 100644
--- a/src/plugins/simulator/fs9/directplaypeer.cpp
+++ b/src/plugins/simulator/fs9/directplaypeer.cpp
@@ -30,7 +30,7 @@ namespace BlackSimPlugin
             return cats;
         }
 
-        CDirectPlayPeer::CDirectPlayPeer(QObject *parent, const CCallsign &callsign)
+        CDirectPlayPeer::CDirectPlayPeer(const CCallsign &callsign, QObject *parent)
             : QObject(parent),
               m_callsign(callsign),
               m_callbackWrapper(this, &CDirectPlayPeer::directPlayMessageHandler)
@@ -151,17 +151,17 @@ namespace BlackSimPlugin
                     break;
                 }
             case DPN_MSGID_CONNECT_COMPLETE:
-            {
-                const PDPNMSG_CONNECT_COMPLETE connectCompleteMsg = static_cast<PDPNMSG_CONNECT_COMPLETE>(msgBuffer);
-                if (connectCompleteMsg->hResultCode == DPN_OK)
                 {
-                    emit connectionComplete();
+                    const PDPNMSG_CONNECT_COMPLETE connectCompleteMsg = static_cast<PDPNMSG_CONNECT_COMPLETE>(msgBuffer);
+                    if (connectCompleteMsg->hResultCode == DPN_OK)
+                    {
+                        emit connectionComplete();
+                    }
+                    else
+                    {
+                        CLogMessage(this).warning(u"DirectPlay connection returned: %1") << connectCompleteMsg->hResultCode;
+                    }
                 }
-                else
-                {
-                    CLogMessage(this).warning(u"DirectPlay connection returned: %1") << connectCompleteMsg->hResultCode;
-                }
-            }
             }
 
             // Directx9 SDK: Unless otherwise noted, this function should return S_OK.
diff --git a/src/plugins/simulator/fs9/directplaypeer.h b/src/plugins/simulator/fs9/directplaypeer.h
index d732e2f4a..7edcffa75 100644
--- a/src/plugins/simulator/fs9/directplaypeer.h
+++ b/src/plugins/simulator/fs9/directplaypeer.h
@@ -13,7 +13,6 @@
 #include "hostnode.h"
 #include "callbackwrapper.h"
 #include "blackmisc/aviation/callsign.h"
-#include "blackmisc/worker.h"
 #include "blackmisc/logcategorylist.h"
 #include <QObject>
 #include <QList>
@@ -38,7 +37,7 @@ namespace BlackSimPlugin
 
         public:
             //! Constructor
-            CDirectPlayPeer(QObject *parent, const BlackMisc::Aviation::CCallsign &callsign);
+            CDirectPlayPeer(const BlackMisc::Aviation::CCallsign &callsign, QObject *parent = nullptr);
 
             //! Destructor
             virtual ~CDirectPlayPeer() override;
diff --git a/src/plugins/simulator/fs9/fs9client.cpp b/src/plugins/simulator/fs9/fs9client.cpp
index 31d1badb2..62e980fd5 100644
--- a/src/plugins/simulator/fs9/fs9client.cpp
+++ b/src/plugins/simulator/fs9/fs9client.cpp
@@ -35,7 +35,7 @@ namespace BlackSimPlugin
         CFs9Client::CFs9Client(const CSimulatedAircraft &remoteAircraft,
                                const CTime &updateInterval,
                                CInterpolationLogger *logger, ISimulator *simulator) :
-            CDirectPlayPeer(simulator, remoteAircraft.getCallsign()),
+            CDirectPlayPeer(remoteAircraft.getCallsign(), simulator),
             m_remoteAircraft(remoteAircraft),
             m_updateInterval(updateInterval),
             m_interpolator(remoteAircraft.getCallsign(), simulator, simulator, simulator->getRemoteAircraftProvider(), logger),
@@ -296,15 +296,15 @@ namespace BlackSimPlugin
 
             DPNHANDLE asyncOpHandle;
             hr = m_directPlayPeer->Connect(&dpAppDesc,
-                               m_hostAddress,
-                               m_deviceAddress,
-                               nullptr,
-                               nullptr,
-                               nullptr, 0,
-                               nullptr,
-                               nullptr,
-                               &asyncOpHandle,
-                               0);
+                                           m_hostAddress,
+                                           m_deviceAddress,
+                                           nullptr,
+                                           nullptr,
+                                           nullptr, 0,
+                                           nullptr,
+                                           nullptr,
+                                           &asyncOpHandle,
+                                           0);
             if (!isPending(hr) && isFailure(hr)) { return logDirectPlayError(hr); }
             return hr;
         }
diff --git a/src/plugins/simulator/fs9/fs9host.cpp b/src/plugins/simulator/fs9/fs9host.cpp
index 5609fa2b2..4d62fa0d4 100644
--- a/src/plugins/simulator/fs9/fs9host.cpp
+++ b/src/plugins/simulator/fs9/fs9host.cpp
@@ -24,8 +24,8 @@ namespace BlackSimPlugin
 {
     namespace Fs9
     {
-        CFs9Host::CFs9Host(QObject *owner) :
-            CDirectPlayPeer(owner, sApp->swiftVersionString())
+        CFs9Host::CFs9Host(QObject *parent) :
+            CDirectPlayPeer(sApp->swiftVersionString(), parent)
         {
             initDirectPlay();
             createHostAddress();
diff --git a/src/plugins/simulator/fs9/fs9host.h b/src/plugins/simulator/fs9/fs9host.h
index aba137316..87ce34144 100644
--- a/src/plugins/simulator/fs9/fs9host.h
+++ b/src/plugins/simulator/fs9/fs9host.h
@@ -31,7 +31,7 @@ namespace BlackSimPlugin
             };
 
             //! Constructor
-            CFs9Host(QObject *owner);
+            CFs9Host(QObject *parent = nullptr);
 
             //! Destructor
             virtual ~CFs9Host() override;
diff --git a/src/plugins/simulator/fs9/simulatorfs9.cpp b/src/plugins/simulator/fs9/simulatorfs9.cpp
index 8f4ff0e8e..7455de5ff 100644
--- a/src/plugins/simulator/fs9/simulatorfs9.cpp
+++ b/src/plugins/simulator/fs9/simulatorfs9.cpp
@@ -553,7 +553,7 @@ namespace BlackSimPlugin
 
         CSimulatorFs9Factory::CSimulatorFs9Factory(QObject *parent) :
             QObject(parent),
-            m_fs9Host(new CFs9Host(this), cleanupFs9Host),
+            m_fs9Host(new CFs9Host, cleanupFs9Host),
             m_lobbyClient(new CLobbyClient, cleanupLobbyClient)
         {
             registerMetadata();