diff --git a/src/blackcore/databasereader.cpp b/src/blackcore/databasereader.cpp
index 50dffd9d5..03f7f9853 100644
--- a/src/blackcore/databasereader.cpp
+++ b/src/blackcore/databasereader.cpp
@@ -24,6 +24,12 @@ namespace BlackCore
         connect(&m_watchdogTimer, &QTimer::timeout, this, &CDatabaseReader::ps_watchdog);
     }
 
+    const CLogCategoryList &CDatabaseReader::getLogCategories()
+    {
+        static const BlackMisc::CLogCategoryList cats { BlackMisc::CLogCategory::swiftDbWebservice(), BlackMisc::CLogCategory::mapping() };
+        return cats;
+    }
+
     void CDatabaseReader::readInBackgroundThread(CEntityFlags::Entity entities, const QDateTime &newerThan)
     {
         if (isAbandoned()) { return; }
diff --git a/src/blackcore/databasereader.h b/src/blackcore/databasereader.h
index 90fc186c4..7e2390896 100644
--- a/src/blackcore/databasereader.h
+++ b/src/blackcore/databasereader.h
@@ -76,6 +76,9 @@ namespace BlackCore
             operator QJsonArray() const { return m_jsonArray; }
         };
 
+        //! Log categories
+        static const BlackMisc::CLogCategoryList &getLogCategories();
+
         //! Start reading in own thread
         void readInBackgroundThread(BlackMisc::Network::CEntityFlags::Entity entities, const QDateTime &newerThan);
 
diff --git a/src/blackgui/components/mappingcomponent.h b/src/blackgui/components/mappingcomponent.h
index 147e2f057..c69bd8068 100644
--- a/src/blackgui/components/mappingcomponent.h
+++ b/src/blackgui/components/mappingcomponent.h
@@ -9,8 +9,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_MAPPINGCOMPONENT_H
-#define BLACKGUI_MAPPINGCOMPONENT_H
+#ifndef BLACKGUI_COMPONENTS_MAPPINGCOMPONENT_H
+#define BLACKGUI_COMPONENTS_MAPPINGCOMPONENT_H
 
 #include "blackgui/blackguiexport.h"
 #include "blackgui/components/enablefordockwidgetinfoarea.h"
diff --git a/src/blackgui/models/listmodelbase.cpp b/src/blackgui/models/listmodelbase.cpp
index ed2267952..b721edc45 100644
--- a/src/blackgui/models/listmodelbase.cpp
+++ b/src/blackgui/models/listmodelbase.cpp
@@ -587,13 +587,7 @@ namespace BlackGui
                 return Private::compareForModelSort<ObjectType>(a, b, order, propertyIndex, marker);
             };
 
-            //! \todo Time measurement will be removed
-            QTime t;
-            t.start();
-            const ContainerType sorted = container.sorted(p);
-            int te = t.elapsed();
-            CLogMessage(this).info("Sorted %1 in %2") << typeid(ObjectType).name() <<  te;
-            return sorted;
+            return container.sorted(p);
         }
 
         template <typename ObjectType, typename ContainerType, bool UseCompare>