diff --git a/src/blackmisc/aviation/aircraftsituation.cpp b/src/blackmisc/aviation/aircraftsituation.cpp
index a8870edc9..4d572c286 100644
--- a/src/blackmisc/aviation/aircraftsituation.cpp
+++ b/src/blackmisc/aviation/aircraftsituation.cpp
@@ -1050,7 +1050,7 @@ namespace BlackMisc
 
         bool CAircraftSituation::canLikelySkipNearGroundInterpolation() const
         {
-            // those we can exclude, we are ON GROUND
+            // those we can exclude, we are ON GROUND not guessed
             if (this->isOnGround() && this->hasInboundGroundDetails()) { return false; }
 
             // cases where we can skip
diff --git a/src/blackmisc/aviation/aircraftsituationlist.cpp b/src/blackmisc/aviation/aircraftsituationlist.cpp
index 1c1b5f5e9..99d027a12 100644
--- a/src/blackmisc/aviation/aircraftsituationlist.cpp
+++ b/src/blackmisc/aviation/aircraftsituationlist.cpp
@@ -386,7 +386,7 @@ namespace BlackMisc
             return found;
         }
 
-        CAircraftSituation CAircraftSituationList::findCLosestElevationWithinRange(const ICoordinateGeodetic &coordinate, const CLength &range) const
+        CAircraftSituation CAircraftSituationList::findClosestElevationWithinRange(const ICoordinateGeodetic &coordinate, const CLength &range) const
         {
             CLength r = range.isNull() || range < CElevationPlane::singlePointRadius() ? CElevationPlane::singlePointRadius() : range;
             CAircraftSituation situationWithElevation = CAircraftSituation::null();
diff --git a/src/blackmisc/aviation/aircraftsituationlist.h b/src/blackmisc/aviation/aircraftsituationlist.h
index e3664c3da..62580108b 100644
--- a/src/blackmisc/aviation/aircraftsituationlist.h
+++ b/src/blackmisc/aviation/aircraftsituationlist.h
@@ -148,7 +148,7 @@ namespace BlackMisc
             CAircraftSituationList findOnGroundWithElevation(CAircraftSituation::IsOnGround og) const;
 
             //! CLosest elevation within given range
-            CAircraftSituation findCLosestElevationWithinRange(const Geo::ICoordinateGeodetic &coordinate, const PhysicalQuantities::CLength &range = Geo::CElevationPlane::singlePointRadius()) const;
+            CAircraftSituation findClosestElevationWithinRange(const Geo::ICoordinateGeodetic &coordinate, const PhysicalQuantities::CLength &range = Geo::CElevationPlane::singlePointRadius()) const;
 
             //! Set on ground
             int setOnGround(CAircraftSituation::IsOnGround og);
diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
index 80687291e..43dd594b4 100644
--- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
+++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
@@ -258,7 +258,7 @@ namespace BlackSimPlugin
             case CStatusMessage::SeverityError:   type = SIMCONNECT_TEXT_TYPE_PRINT_RED;    break;
             }
             const HRESULT hr = SimConnect_Text(m_hSimConnect, type, 7.5, EventTextMessage, static_cast<DWORD>(m.size()), m.data());
-            Q_UNUSED(hr);
+            Q_UNUSED(hr)
         }
 
         void CSimulatorFsxCommon::displayTextMessage(const CTextMessage &message) const
@@ -272,7 +272,7 @@ namespace BlackSimPlugin
             else if (message.isRadioMessage())   { type = SIMCONNECT_TEXT_TYPE_PRINT_GREEN; }
 
             const HRESULT hr = SimConnect_Text(m_hSimConnect, type, 7.5, EventTextMessage, static_cast<DWORD>(m.size()), m.data());
-            Q_UNUSED(hr);
+            Q_UNUSED(hr)
         }
 
         bool CSimulatorFsxCommon::isPhysicallyRenderedAircraft(const CCallsign &callsign) const
@@ -622,13 +622,13 @@ namespace BlackSimPlugin
         void CSimulatorFsxCommon::removeCamera(CSimConnectObject &simObject)
         {
             // not in FSX
-            Q_UNUSED(simObject);
+            Q_UNUSED(simObject)
         }
 
         void CSimulatorFsxCommon::removeObserver(CSimConnectObject &simObject)
         {
             // not in FSX
-            Q_UNUSED(simObject);
+            Q_UNUSED(simObject)
         }
 
         bool CSimulatorFsxCommon::triggerAutoTraceSendId(qint64 traceTimeMs)
@@ -734,7 +734,7 @@ namespace BlackSimPlugin
                 com1.setReceiveEnabled(com1Status == 0 && (comReceiveAll || com1Transmit));
                 const bool changedCom1 = myAircraft.getCom1System() != com1;
                 m_simCom1 = com1;
-                Q_UNUSED(com1Test);
+                Q_UNUSED(com1Test)
 
                 com2.setFrequencyActive(CFrequency(simulatorOwnAircraft.com2ActiveMHz, CFrequencyUnit::MHz()));
                 com2.setFrequencyStandby(CFrequency(simulatorOwnAircraft.com2StandbyMHz, CFrequencyUnit::MHz()));
@@ -745,7 +745,7 @@ namespace BlackSimPlugin
                 com2.setReceiveEnabled(com2Status == 0 && (comReceiveAll || com2Transmit));
                 const bool changedCom2 = myAircraft.getCom2System() != com2;
                 m_simCom2 = com2;
-                Q_UNUSED(com2Test);
+                Q_UNUSED(com2Test)
 
                 CTransponder transponder(myAircraft.getTransponder());
                 transponder.setTransponderCode(qRound(simulatorOwnAircraft.transponderCode));
@@ -1363,7 +1363,7 @@ namespace BlackSimPlugin
 
         void CSimulatorFsxCommon::timerEvent(QTimerEvent *event)
         {
-            Q_UNUSED(event);
+            Q_UNUSED(event)
             if (this->isShuttingDown()) { return; }
             this->dispatch();
         }
@@ -2018,7 +2018,7 @@ namespace BlackSimPlugin
 
                 // Interpolated parts
                 const bool updatedParts = this->updateRemoteAircraftParts(simObject, result, forceUpdate);
-                Q_UNUSED(updatedParts);
+                Q_UNUSED(updatedParts)
 
             } // all callsigns
 
@@ -2874,7 +2874,7 @@ namespace BlackSimPlugin
 
         void CSimulatorFsxCommonListener::SimConnectProc(SIMCONNECT_RECV *pData, DWORD cbData, void *pContext)
         {
-            Q_UNUSED(cbData);
+            Q_UNUSED(cbData)
             CSimulatorFsxCommonListener *simListener = static_cast<CSimulatorFsxCommonListener *>(pContext);
             switch (pData->dwID)
             {
diff --git a/src/plugins/simulator/p3d/simulatorp3d.cpp b/src/plugins/simulator/p3d/simulatorp3d.cpp
index 8738d56a5..741b028b7 100644
--- a/src/plugins/simulator/p3d/simulatorp3d.cpp
+++ b/src/plugins/simulator/p3d/simulatorp3d.cpp
@@ -85,9 +85,9 @@ namespace BlackSimPlugin
                     if (pObjData->dwArraySize != 1) { break; }
                     const SIMCONNECT_DATA_GROUND_INFO gi = pObjData->rgData[0];
                     if (!gi.bIsValid) { break; }
-                    const CLatitude lat(gi.fLat, CAngleUnit::deg());
+                    const CLatitude  lat(gi.fLat, CAngleUnit::deg());
                     const CLongitude lng(gi.fLon, CAngleUnit::deg());
-                    const CAltitude alt(gi.fAlt, CAltitude::MeanSeaLevel, CAltitude::TrueAltitude, CLengthUnit::ft());
+                    const CAltitude  alt(gi.fAlt, CAltitude::MeanSeaLevel, CAltitude::TrueAltitude, CLengthUnit::ft());
                     const CCoordinateGeodetic coordinate(lat, lng, alt);
                     const CElevationPlane ep(coordinate, CElevationPlane::singlePointRadius());
 
diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp
index fab9d2f24..4a0936bd0 100644
--- a/src/plugins/simulator/xplane/simulatorxplane.cpp
+++ b/src/plugins/simulator/xplane/simulatorxplane.cpp
@@ -583,7 +583,7 @@ namespace BlackSimPlugin
         {
             Q_ASSERT(this->isConnected());
             if (originator == this->identifier()) { return false; }
-            Q_UNUSED(selcal);
+            Q_UNUSED(selcal)
 
             //! \fixme KB 8/2017 use SELCAL??
             return false;
@@ -1198,7 +1198,7 @@ namespace BlackSimPlugin
             }
 
             const bool wasPending = (m_addingInProgressAircraft.remove(cs) > 0);
-            Q_UNUSED(wasPending);
+            Q_UNUSED(wasPending)
 
             if (failedRemoteAircraft.hasCallsign() && !m_aircraftAddedFailed.containsCallsign(cs))
             {