diff --git a/src/blackcore/audio_mixer.h b/src/blackcore/audio_mixer.h
index 978bb7945..fc0a89c7d 100644
--- a/src/blackcore/audio_mixer.h
+++ b/src/blackcore/audio_mixer.h
@@ -38,10 +38,7 @@ namespace BlackCore
             OutputVoiceChannel2,
         };
 
-        /*!
-         * \brief Default constructor with parent
-         * \param parent
-         */
+        //! Default constructor
         IAudioMixer(QObject *parent = nullptr);
 
         //! Virtual destructor.
diff --git a/src/blackgui/components/atcstationcomponent.cpp b/src/blackgui/components/atcstationcomponent.cpp
index cc4255968..78c031cd1 100644
--- a/src/blackgui/components/atcstationcomponent.cpp
+++ b/src/blackgui/components/atcstationcomponent.cpp
@@ -262,6 +262,7 @@ namespace BlackGui
 
         void CAtcStationComponent::updateTreeView()
         {
+            // EXPERIMENTAL CODE
             QAbstractItemModel *old = (this->ui->tvp_AtcStationsOnlineTree->model());
             this->ui->tvp_AtcStationsOnlineTree->setModel(
                 this->ui->tvp_AtcStationsOnline->derivedModel()->toAtcGroupModel()
diff --git a/src/blackgui/models/serverlistmodel.cpp b/src/blackgui/models/serverlistmodel.cpp
index f9680c114..a7818787c 100644
--- a/src/blackgui/models/serverlistmodel.cpp
+++ b/src/blackgui/models/serverlistmodel.cpp
@@ -1,7 +1,11 @@
-/*  Copyright (C) 2013 VATSIM Community / contributors
- *  This Source Code Form is subject to the terms of the Mozilla Public
- *  License, v. 2.0. If a copy of the MPL was not distributed with this
- *  file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/* Copyright (C) 2013
+ * swift Project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
 
 #include "serverlistmodel.h"
 #include "blackmisc/blackmiscfreefunctions.h"
diff --git a/src/blackmisc/geo/coordinategeodetic.cpp b/src/blackmisc/geo/coordinategeodetic.cpp
index ad2e6b7bf..90b4a7eef 100644
--- a/src/blackmisc/geo/coordinategeodetic.cpp
+++ b/src/blackmisc/geo/coordinategeodetic.cpp
@@ -95,6 +95,12 @@ namespace BlackMisc
             return Geo::calculateBearing((*this), otherCoordinate);
         }
 
+        bool ICoordinateGeodetic::canHandleIndex(const CPropertyIndex &index)
+        {
+            int i = index.frontCasted<int>();
+            return (i >= static_cast<int>(IndexLatitude)) && (i <= static_cast<int>(IndexGeodeticHeightAsString));
+        }
+
         CVariant ICoordinateGeodetic::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
             if (!index.isMyself())
diff --git a/src/blackmisc/geo/coordinategeodetic.h b/src/blackmisc/geo/coordinategeodetic.h
index 2f5f1402b..800d98a18 100644
--- a/src/blackmisc/geo/coordinategeodetic.h
+++ b/src/blackmisc/geo/coordinategeodetic.h
@@ -74,12 +74,9 @@ namespace BlackMisc
             //! Initial bearing
             BlackMisc::PhysicalQuantities::CAngle bearing(const ICoordinateGeodetic &otherCoordinate) const;
 
-            //! Can given index be handled
-            static bool canHandleIndex(const BlackMisc::CPropertyIndex &index)
-            {
-                int i = index.frontCasted<int>();
-                return (i >= static_cast<int>(IndexLatitude)) && (i <= static_cast<int>(IndexGeodeticHeightAsString));
-            }
+        protected:
+            //! Can given index be handled?
+            static bool canHandleIndex(const BlackMisc::CPropertyIndex &index);
         };
 
         //! Great circle distance between points
diff --git a/src/blackmisc/pq/time.cpp b/src/blackmisc/pq/time.cpp
index bfd25c9b3..4ce92c9a6 100644
--- a/src/blackmisc/pq/time.cpp
+++ b/src/blackmisc/pq/time.cpp
@@ -88,7 +88,7 @@ namespace BlackMisc
         QTime CTime::toQTime() const
         {
             CTime copy(*this);
-            copy.setUnit(CTimeUnit::hms());
+            copy.switchUnit(CTimeUnit::hms());
 
             // QTime is not defined for negative numbers
             // so we use the absolute value here
diff --git a/src/blackmisc/simulation/modelmappingsprovider.cpp b/src/blackmisc/simulation/modelmappingsprovider.cpp
index 62a0c08cf..3753958a0 100644
--- a/src/blackmisc/simulation/modelmappingsprovider.cpp
+++ b/src/blackmisc/simulation/modelmappingsprovider.cpp
@@ -16,13 +16,11 @@ namespace BlackMisc
 {
     namespace Simulation
     {
-
         IModelMappingsProvider::IModelMappingsProvider(QObject *parent) : QObject(parent) {}
 
         const CAircraftMappingList &IModelMappingsProvider::getMappingList() const
         {
-            return this->m_mappings;
+            return m_mappings;
         }
-
     } // namespace
 } // namespace
diff --git a/src/blackmisc/simulation/modelmappingsprovider.h b/src/blackmisc/simulation/modelmappingsprovider.h
index ffab11e0e..e61d6f969 100644
--- a/src/blackmisc/simulation/modelmappingsprovider.h
+++ b/src/blackmisc/simulation/modelmappingsprovider.h
@@ -40,7 +40,7 @@ namespace BlackMisc
             const BlackMisc::Network::CAircraftMappingList &getMappingList() const;
 
         protected:
-            BlackMisc::Network::CAircraftMappingList m_mappings; //!< Mappings
+            BlackMisc::Network::CAircraftMappingList m_mappings; //!< mappings
         };
 
         //! Model mappings dummy