diff --git a/src/blackcore/vatsim/vatsimdatafilereader.cpp b/src/blackcore/vatsim/vatsimdatafilereader.cpp
index fbc265610..0110e8a34 100644
--- a/src/blackcore/vatsim/vatsimdatafilereader.cpp
+++ b/src/blackcore/vatsim/vatsimdatafilereader.cpp
@@ -272,7 +272,7 @@ namespace BlackCore
                             const QMap<QString, QString> clientPartsMap = clientPartsToMap(currentLine, clientSectionAttributes);
                             const CCallsign callsign = CCallsign(clientPartsMap["callsign"]);
                             if (callsign.isEmpty()) { break; }
-                            const BlackMisc::Network::CUser user(clientPartsMap["cid"], clientPartsMap["realname"], callsign);
+                            const CUser user(clientPartsMap["cid"], clientPartsMap["realname"], callsign);
                             const QString clientType = clientPartsMap["clienttype"].toLower();
                             if (clientType.isEmpty()) { break; } // sometimes type is empty
                             const double lat = clientPartsMap["latitude"].toDouble();
@@ -405,7 +405,7 @@ namespace BlackCore
                 // warnings, if required
                 if (!illegalEquipmentCodes.isEmpty())
                 {
-                    logInconsistentData(
+                    CVatsimDataFileReader::logInconsistentData(
                         CStatusMessage(this, CStatusMessage::SeverityInfo, "Illegal / ignored equipment code(s) in VATSIM data file: " + illegalEquipmentCodes.join(", "))
                     );
                 }
diff --git a/src/blackmisc/simulation/aircraftmodel.h b/src/blackmisc/simulation/aircraftmodel.h
index d59d461a2..5db6b20ad 100644
--- a/src/blackmisc/simulation/aircraftmodel.h
+++ b/src/blackmisc/simulation/aircraftmodel.h
@@ -169,7 +169,7 @@ namespace BlackMisc
             //! Aircraft ICAO code
             const Aviation::CAircraftIcaoCode &getAircraftIcaoCode() const { return m_aircraftIcao; }
 
-            //! \copydoc BlackMisc::Aviation::CAircraftIcaoCode::getEngineCount
+            //! \copydoc BlackMisc::Aviation::CAircraftIcaoCode::getEnginesCount
             int getEngineCount() const { return m_aircraftIcao.getEnginesCount(); }
 
             //! Aircraft ICAO code designator
diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
index 849fb4675..afe339396 100644
--- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
+++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
@@ -875,9 +875,9 @@ namespace BlackSimPlugin
 
             // create AI
             bool adding = false;
-            CSimulatedAircraft addedAircraft(newRemoteAircraft);
+            const CSimulatedAircraft addedAircraft(newRemoteAircraft);
             const SIMCONNECT_DATA_REQUEST_ID requestId = this->obtainRequestIdForSimData();
-            const SIMCONNECT_DATA_INITPOSITION initialPosition = aircraftSituationToFsxPosition(addedAircraft.getSituation());
+            const SIMCONNECT_DATA_INITPOSITION initialPosition = CSimulatorFsxCommon::aircraftSituationToFsxPosition(addedAircraft.getSituation());
             const QString modelString(addedAircraft.getModelString());
             if (this->showDebugLogMessage()) { this->debugLogMessage(Q_FUNC_INFO, QString("Cs: '%1' model: '%2' request: %3, init pos: %4").arg(callsign.toQString(), modelString).arg(requestId).arg(fsxPositionToString(initialPosition))); }
 
diff --git a/src/xswiftbus/dbusmessage.cpp b/src/xswiftbus/dbusmessage.cpp
index 7cc79b97e..b5c817ba1 100644
--- a/src/xswiftbus/dbusmessage.cpp
+++ b/src/xswiftbus/dbusmessage.cpp
@@ -116,7 +116,7 @@ namespace XSwiftBus
         DBusMessageIter arrayIterator;
         dbus_message_iter_open_container(&m_messageIterator, DBUS_TYPE_ARRAY, DBUS_TYPE_DOUBLE_AS_STRING, &arrayIterator);
         const double *ptr = array.data();
-        dbus_message_iter_append_fixed_array(&arrayIterator, DBUS_TYPE_DOUBLE, &ptr, array.size());
+        dbus_message_iter_append_fixed_array(&arrayIterator, DBUS_TYPE_DOUBLE, &ptr, static_cast<int>(array.size()));
         dbus_message_iter_close_container(&m_messageIterator, &arrayIterator);
     }
 
@@ -124,7 +124,7 @@ namespace XSwiftBus
     {
         DBusMessageIter arrayIterator;
         dbus_message_iter_open_container(&m_messageIterator, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING_AS_STRING, &arrayIterator);
-        for (const auto & i : array)
+        for (const auto &i : array)
         {
             const char *ptr = i.c_str();
             dbus_message_iter_append_basic(&arrayIterator, DBUS_TYPE_STRING, &ptr);
diff --git a/src/xswiftbus/service.cpp b/src/xswiftbus/service.cpp
index 969f329cb..c87beda0e 100644
--- a/src/xswiftbus/service.cpp
+++ b/src/xswiftbus/service.cpp
@@ -21,7 +21,7 @@ namespace XSwiftBus
     CService::CService(CDBusConnection *connection) : CDBusObject(connection)
     {
         registerDBusObjectPath(XSWIFTBUS_SERVICE_INTERFACENAME, XSWIFTBUS_SERVICE_OBJECTPATH);
-        m_messages.addMessage( { "xswiftbus started.", 0, 255, 255 } );
+        m_messages.addMessage({ "xswiftbus started.", 0, 255, 255 });
         updateAirportsInRange();
     }
 
@@ -201,14 +201,14 @@ namespace XSwiftBus
                 message.getArgument(green);
                 message.getArgument(blue);
 
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     addTextMessage(text, red, green, blue);
                 });
             }
             else if (message.getMethodName() == "getOwnAircraftSituationData")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     double lat = m_latitude.get();
                     double lon = m_longitude.get();
@@ -234,276 +234,276 @@ namespace XSwiftBus
             else if (message.getMethodName() == "updateAirportsInRange")
             {
                 maybeSendEmptyDBusReply(wantsReply, sender, serial);
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     updateAirportsInRange();
                 });
             }
             else if (message.getMethodName() == "getAircraftModelPath")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getAircraftModelPath());
-                 });
+                });
             }
             else if (message.getMethodName() == "getAircraftModelFilename")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getAircraftModelFilename());
                 });
             }
             else if (message.getMethodName() == "getAircraftModelString")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getAircraftModelString());
-                 });
+                });
             }
             else if (message.getMethodName() == "getAircraftName")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getAircraftName());
-                 });
+                });
             }
             else if (message.getMethodName() == "getAircraftLivery")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getAircraftLivery());
-                 });
+                });
             }
             else if (message.getMethodName() == "getAircraftIcaoCode")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getAircraftIcaoCode());
-                 });
+                });
             }
             else if (message.getMethodName() == "getAircraftDescription")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getAircraftDescription());
-                 });
+                });
             }
             else if (message.getMethodName() == "getXPlaneVersionMajor")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getXPlaneVersionMajor());
-                 });
+                });
             }
             else if (message.getMethodName() == "getXPlaneVersionMinor")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getXPlaneVersionMinor());
                 });
             }
             else if (message.getMethodName() == "getXPlaneInstallationPath")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getXPlaneInstallationPath());
-                 });
+                });
             }
             else if (message.getMethodName() == "getXPlanePreferencesPath")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getXPlanePreferencesPath());
-                 });
+                });
             }
             else if (message.getMethodName() == "isPaused")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, isPaused());
-                 });
+                });
             }
             else if (message.getMethodName() == "isUsingRealTime")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, isUsingRealTime());
-                 });
+                });
             }
             else if (message.getMethodName() == "getLatitude")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getLatitude());
-                 });
+                });
             }
             else if (message.getMethodName() == "getLongitude")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getLongitude());
-                 });
+                });
             }
             else if (message.getMethodName() == "getAltitudeMSL")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getAltitudeMSL());
-                 });
+                });
             }
             else if (message.getMethodName() == "getHeightAGL")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getHeightAGL());
-                 });
+                });
             }
             else if (message.getMethodName() == "getGroundSpeed")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getGroundSpeed());
-                 });
+                });
             }
             else if (message.getMethodName() == "getIndicatedAirspeed")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getIndicatedAirspeed());
-                 });
+                });
             }
             else if (message.getMethodName() == "getTrueAirspeed")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getTrueAirspeed());
-                 });
+                });
             }
             else if (message.getMethodName() == "getPitch")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getPitch());
-                 });
+                });
             }
             else if (message.getMethodName() == "getRoll")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getRoll());
-                 });
+                });
             }
             else if (message.getMethodName() == "getTrueHeading")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getTrueHeading());
-                 });
+                });
             }
             else if (message.getMethodName() == "getAnyWheelOnGround")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getAnyWheelOnGround());
-                 });
+                });
             }
             else if (message.getMethodName() == "getAllWheelsOnGround")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getAllWheelsOnGround());
-                 });
+                });
             }
             else if (message.getMethodName() == "getCom1Active")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getCom1Active());
-                 });
+                });
             }
             else if (message.getMethodName() == "getCom1Standby")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getCom1Standby());
-                 });
+                });
             }
             else if (message.getMethodName() == "getCom2Active")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getCom2Active());
-                 });
+                });
             }
             else if (message.getMethodName() == "getCom2Standby")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getCom2Standby());
-                 });
+                });
             }
             else if (message.getMethodName() == "getTransponderCode")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getTransponderCode());
-                 });
+                });
             }
             else if (message.getMethodName() == "getTransponderMode")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getTransponderMode());
-                 });
+                });
             }
             else if (message.getMethodName() == "getTransponderIdent")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getTransponderIdent());
-                 });
+                });
             }
             else if (message.getMethodName() == "getBeaconLightsOn")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getBeaconLightsOn());
-                 });
+                });
             }
             else if (message.getMethodName() == "getLandingLightsOn")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getLandingLightsOn());
-                 });
+                });
             }
             else if (message.getMethodName() == "getNavLightsOn")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getNavLightsOn());
-                 });
+                });
             }
             else if (message.getMethodName() == "getStrobeLightsOn")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getStrobeLightsOn());
-                 });
+                });
             }
             else if (message.getMethodName() == "getTaxiLightsOn")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getTaxiLightsOn());
-                 });
+                });
             }
             else if (message.getMethodName() == "getQNH")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getQNH());
-                 });
+                });
             }
             else if (message.getMethodName() == "setCom1Active")
             {
@@ -511,10 +511,10 @@ namespace XSwiftBus
                 int frequency = 0;
                 message.beginArgumentRead();
                 message.getArgument(frequency);
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     setCom1Active(frequency);
-                 });
+                });
             }
             else if (message.getMethodName() == "setCom1Standby")
             {
@@ -522,10 +522,10 @@ namespace XSwiftBus
                 int frequency = 0;
                 message.beginArgumentRead();
                 message.getArgument(frequency);
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     setCom1Standby(frequency);
-                 });
+                });
             }
             else if (message.getMethodName() == "setCom2Active")
             {
@@ -533,10 +533,10 @@ namespace XSwiftBus
                 int frequency = 0;
                 message.beginArgumentRead();
                 message.getArgument(frequency);
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     setCom2Active(frequency);
-                 });
+                });
             }
             else if (message.getMethodName() == "setCom2Standby")
             {
@@ -544,10 +544,10 @@ namespace XSwiftBus
                 int frequency = 0;
                 message.beginArgumentRead();
                 message.getArgument(frequency);
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     setCom2Standby(frequency);
-                 });
+                });
             }
             else if (message.getMethodName() == "setTransponderCode")
             {
@@ -555,10 +555,10 @@ namespace XSwiftBus
                 int code = 0;
                 message.beginArgumentRead();
                 message.getArgument(code);
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     setTransponderCode(code);
-                 });
+                });
             }
             else if (message.getMethodName() == "setTransponderMode")
             {
@@ -566,54 +566,54 @@ namespace XSwiftBus
                 int mode = 0;
                 message.beginArgumentRead();
                 message.getArgument(mode);
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     setTransponderMode(mode);
-                 });
+                });
             }
             else if (message.getMethodName() == "getFlapsDeployRatio")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getFlapsDeployRatio());
-                 });
+                });
             }
             else if (message.getMethodName() == "getGearDeployRatio")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getGearDeployRatio());
-                 });
+                });
             }
             else if (message.getMethodName() == "getNumberOfEngines")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getNumberOfEngines());
-                 });
+                });
             }
             else if (message.getMethodName() == "getEngineN1Percentage")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     std::vector<double> array = getEngineN1Percentage();
                     sendDBusReply(sender, serial, array);
-                 });
+                });
             }
             else if (message.getMethodName() == "getSpeedBrakeRatio")
             {
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     sendDBusReply(sender, serial, getSpeedBrakeRatio());
-                 });
+                });
             }
             else if (message.getMethodName() == "toggleMessageBoxVisibility")
             {
                 maybeSendEmptyDBusReply(wantsReply, sender, serial);
-                queueDBusCall([=]()
+                queueDBusCall([ = ]()
                 {
                     toggleMessageBoxVisibility();
-                 });
+                });
             }
             else
             {
@@ -647,7 +647,7 @@ namespace XSwiftBus
     }
 
     void CService::emitAirportsInRangeUpdated(const std::vector<std::string> &icaoCodes, const std::vector<std::string> &names,
-                                              const std::vector<double> &lats, const std::vector<double> &lons, const std::vector<double> &alts)
+            const std::vector<double> &lats, const std::vector<double> &lons, const std::vector<double> &alts)
     {
         CDBusMessage signalAirportsInRangeUpdated = CDBusMessage::createSignal(XSWIFTBUS_SERVICE_OBJECTPATH, XSWIFTBUS_SERVICE_INTERFACENAME, "airportsInRangeUpdated");
         signalAirportsInRangeUpdated.beginArgumentWrite();
@@ -730,7 +730,7 @@ namespace XSwiftBus
         CAircraftModel model;
 
         std::ifstream fs(filePath, std::ios::in | std::ios::binary);
-        if(!fs.is_open()) { return model; }
+        if (!fs.is_open()) { return model; }
 
         std::string i;
         std::string version;