diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp
index 0ed18ece7..9c9fa2b29 100644
--- a/src/blackcore/airspacemonitor.cpp
+++ b/src/blackcore/airspacemonitor.cpp
@@ -369,7 +369,7 @@ namespace BlackCore
         if (callsign.hasSuffix())
         {
             // very likely and ATC callsign
-            const CPropertyIndexVariantMap vm = CPropertyIndexVariantMap({CAtcStation::IndexController, CUser::IndexRealName}, realname);
+            const CPropertyIndexVariantMap vm = CPropertyIndexVariantMap({ CAtcStation::IndexController, CUser::IndexRealName }, realname);
             const int c1 = this->updateOnlineStation(callsign, vm, false, true);
             const int c2 = this->updateBookedStation(callsign, vm, false, true);
             wasAtc = c1 > 0 || c2 > 0;
@@ -382,8 +382,9 @@ namespace BlackCore
         }
 
         // Client
+        if (!sApp || !sApp->getWebDataServices()) { return; }
         const CVoiceCapabilities voiceCaps = sApp->getWebDataServices()->getVoiceCapabilityForCallsign(callsign);
-        CPropertyIndexVariantMap vm = CPropertyIndexVariantMap({CClient::IndexUser, CUser::IndexRealName}, realname);
+        CPropertyIndexVariantMap vm = CPropertyIndexVariantMap({ CClient::IndexUser, CUser::IndexRealName }, realname);
         vm.addValue({ CClient::IndexVoiceCapabilities }, voiceCaps);
         this->updateOrAddClient(callsign, vm, false);
     }
@@ -548,7 +549,7 @@ namespace BlackCore
             station.setFrequency(frequency);
             station.setPosition(position);
             station.setOnline(true);
-            station.calculcateAndUpdateRelativeDistanceAndBearing(getOwnAircraftPosition());
+            station.calculcateAndUpdateRelativeDistanceAndBearing(this->getOwnAircraftPosition());
 
             // sync with bookings
             if (m_atcStationsBooked.containsCallsign(callsign))
@@ -1151,7 +1152,7 @@ namespace BlackCore
 
     CLength CAirspaceMonitor::calculateDistanceToOwnAircraft(const CAircraftSituation &situation) const
     {
-        CLength distance = getOwnAircraft().calculateGreatCircleDistance(situation);
+        CLength distance = this->getOwnAircraft().calculateGreatCircleDistance(situation);
         distance.switchUnit(CLengthUnit::NM());
         return distance;
     }
diff --git a/src/blackgui/components/settingssimulatorbasicscomponent.ui b/src/blackgui/components/settingssimulatorbasicscomponent.ui
index 736b15472..1671b73db 100644
--- a/src/blackgui/components/settingssimulatorbasicscomponent.ui
+++ b/src/blackgui/components/settingssimulatorbasicscomponent.ui
@@ -126,7 +126,7 @@
       <string>copy (materialize) defaults</string>
      </property>
      <property name="text">
-      <string>copy def.</string>
+      <string> copy def. </string>
      </property>
     </widget>
    </item>
diff --git a/src/blackmisc/geo/coordinategeodetic.cpp b/src/blackmisc/geo/coordinategeodetic.cpp
index 98ee0520c..2fb61d5d2 100644
--- a/src/blackmisc/geo/coordinategeodetic.cpp
+++ b/src/blackmisc/geo/coordinategeodetic.cpp
@@ -100,7 +100,7 @@ namespace BlackMisc
         bool ICoordinateGeodetic::isWithinRange(const ICoordinateGeodetic &otherCoordinate, const CLength &range) const
         {
             if (range.isNull()) { return false; }
-            const CLength distance = calculateGreatCircleDistance(otherCoordinate);
+            const CLength distance = this->calculateGreatCircleDistance(otherCoordinate);
             if (distance.isNull()) { return false; }
             return distance <= range;
         }
diff --git a/src/blackmisc/network/urllist.cpp b/src/blackmisc/network/urllist.cpp
index 1b99a3e7a..19a660093 100644
--- a/src/blackmisc/network/urllist.cpp
+++ b/src/blackmisc/network/urllist.cpp
@@ -41,7 +41,7 @@ namespace BlackMisc
         {
             if (this->isEmpty()) { return CUrl(); }
             if (this->size() == 1) { return this->front();}
-            int i = CMathUtils::randomInteger(0, this->size() - 1);
+            const int i = CMathUtils::randomInteger(0, this->size() - 1);
             return (*this)[i];
         }
 
@@ -54,7 +54,7 @@ namespace BlackMisc
             if (timeoutMs < 0) { timeoutMs = CNetworkUtils::getTimeoutMs(); }
             for (int t = 0; t < maxTrials && t < this->size(); t++)
             {
-                CUrl url(getRandomWithout(trials));
+                const CUrl url(this->getRandomWithout(trials));
                 trials.push_back(url);
                 QString message;
                 if (CNetworkUtils::canConnect(url, message, timeoutMs)) { return url; }