diff --git a/src/blackgui/components/dbaircrafticaocomponent.cpp b/src/blackgui/components/dbaircrafticaocomponent.cpp
index a6171bd3a..5ca1deaed 100644
--- a/src/blackgui/components/dbaircrafticaocomponent.cpp
+++ b/src/blackgui/components/dbaircrafticaocomponent.cpp
@@ -7,12 +7,12 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/webdataservices.h"
 #include "blackgui/components/dbaircrafticaocomponent.h"
 #include "blackgui/filters/aircrafticaofilterbar.h"
-#include "blackgui/guiapplication.h"
 #include "blackgui/views/aircrafticaoview.h"
 #include "blackgui/views/viewbase.h"
+#include "blackgui/guiapplication.h"
+#include "blackcore/webdataservices.h"
 #include "dbaircrafticaocomponent.h"
 #include "ui_dbaircrafticaocomponent.h"
 
@@ -23,7 +23,6 @@
 using namespace BlackCore;
 using namespace BlackMisc::Network;
 using namespace BlackMisc::Aviation;
-using namespace BlackGui;
 using namespace BlackGui::Views;
 
 namespace BlackGui
diff --git a/src/blackgui/components/dbaircrafticaocomponent.h b/src/blackgui/components/dbaircrafticaocomponent.h
index 5b0ef33b9..7e8d7af42 100644
--- a/src/blackgui/components/dbaircrafticaocomponent.h
+++ b/src/blackgui/components/dbaircrafticaocomponent.h
@@ -18,7 +18,6 @@
 #include "blackgui/blackguiexport.h"
 #include "blackmisc/network/entityflags.h"
 
-#include <QFrame>
 #include <QObject>
 #include <QScopedPointer>
 
diff --git a/src/blackgui/components/dbaircrafticaocomponent.ui b/src/blackgui/components/dbaircrafticaocomponent.ui
index 6fb78e85b..309eace89 100644
--- a/src/blackgui/components/dbaircrafticaocomponent.ui
+++ b/src/blackgui/components/dbaircrafticaocomponent.ui
@@ -2,6 +2,14 @@
 <ui version="4.0">
  <class>CDbAircraftIcaoComponent</class>
  <widget class="QFrame" name="CDbAircraftIcaoComponent">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>258</width>
+    <height>208</height>
+   </rect>
+  </property>
   <property name="windowTitle">
    <string>Search and find aircraft ICAO codes</string>
   </property>
diff --git a/src/blackgui/components/dbliverycomponent.h b/src/blackgui/components/dbliverycomponent.h
index b77f5d5c5..6627da0fe 100644
--- a/src/blackgui/components/dbliverycomponent.h
+++ b/src/blackgui/components/dbliverycomponent.h
@@ -23,8 +23,8 @@
 #include <QObject>
 #include <QScopedPointer>
 
-namespace BlackMisc { namespace Aviation { class CLivery; } }
 namespace Ui { class CDbLiveryComponent; }
+namespace BlackMisc { namespace Aviation { class CLivery; } }
 namespace BlackGui
 {
     namespace Views { class CLiveryView; }
@@ -36,7 +36,7 @@ namespace BlackGui
         class BLACKGUI_EXPORT CDbLiveryComponent :
             public COverlayMessagesFrame,
             public CEnableForDockWidgetInfoArea,
-            public BlackGui::CEnableForViewBasedIndicator
+            public CEnableForViewBasedIndicator
         {
             Q_OBJECT
 
diff --git a/src/blackgui/models/atcstationtreemodel.cpp b/src/blackgui/models/atcstationtreemodel.cpp
index ea7cd73a8..a3cf45b47 100644
--- a/src/blackgui/models/atcstationtreemodel.cpp
+++ b/src/blackgui/models/atcstationtreemodel.cpp
@@ -43,17 +43,7 @@ namespace BlackGui
     namespace Models
     {
         CAtcStationTreeModel::CAtcStationTreeModel(QObject *parent) : QStandardItemModel(parent)
-        {
-            // force strings for translation in resource files
-            (void)QT_TRANSLATE_NOOP("ModelAtcList", "callsign");
-            (void)QT_TRANSLATE_NOOP("ModelAtcList", "distance");
-            (void)QT_TRANSLATE_NOOP("ModelAtcList", "frequency");
-            (void)QT_TRANSLATE_NOOP("ModelAtcList", "controllername");
-            (void)QT_TRANSLATE_NOOP("ModelAtcList", "online");
-            (void)QT_TRANSLATE_NOOP("ModelAtcList", "bookedfrom");
-            (void)QT_TRANSLATE_NOOP("ModelAtcList", "bookeduntil");
-            (void)QT_TRANSLATE_NOOP("ModelAtcList", "voiceroomurl");
-        }
+        { }
 
         void CAtcStationTreeModel::updateContainer(const CAtcStationList &stations)
         {
diff --git a/src/blackgui/views/viewbase.cpp b/src/blackgui/views/viewbase.cpp
index 269631a3a..a84c41a90 100644
--- a/src/blackgui/views/viewbase.cpp
+++ b/src/blackgui/views/viewbase.cpp
@@ -8,10 +8,10 @@
  */
 
 #include "blackgui/guiutility.h"
-#include "blackgui/models/allmodels.h"
 #include "blackgui/views/viewbase.h"
 #include "blackgui/views/viewbaseproxystyle.h"
 #include "blackgui/views/viewbaseitemdelegate.h"
+#include "blackgui/models/allmodels.h"
 #include "blackgui/components/texteditdialog.h"
 #include "blackmisc/worker.h"
 #include "blackconfig/buildconfig.h"
diff --git a/src/blackgui/views/viewbaseaviation.cpp b/src/blackgui/views/viewbaseaviation.cpp
index 50e95d530..693a56628 100644
--- a/src/blackgui/views/viewbaseaviation.cpp
+++ b/src/blackgui/views/viewbaseaviation.cpp
@@ -13,7 +13,6 @@ namespace BlackGui
 {
     namespace Views
     {
-        template class CViewBase<BlackGui::Models::CAircraftModelListModel>;
         template class CViewBase<BlackGui::Models::CAircraftPartsListModel>;
         template class CViewBase<BlackGui::Models::CAircraftSituationListModel>;
         template class CViewBase<BlackGui::Models::CAircraftSituationChangeListModel>;
diff --git a/src/blackgui/views/viewbasesimulation.cpp b/src/blackgui/views/viewbasesimulation.cpp
index e89a72198..7d887c544 100644
--- a/src/blackgui/views/viewbasesimulation.cpp
+++ b/src/blackgui/views/viewbasesimulation.cpp
@@ -13,6 +13,7 @@ namespace BlackGui
 {
     namespace Views
     {
+        template class CViewBase<BlackGui::Models::CAircraftModelListModel>;
         template class CViewBase<BlackGui::Models::CDistributorListModel>;
         template class CViewBase<BlackGui::Models::CInterpolationSetupListModel>;
         template class CViewBase<BlackGui::Models::CMatchingStatisticsModel>;
diff --git a/src/blackgui/views/viewdbobjects.cpp b/src/blackgui/views/viewdbobjects.cpp
index 4516a1a32..b4b48d3e5 100644
--- a/src/blackgui/views/viewdbobjects.cpp
+++ b/src/blackgui/views/viewdbobjects.cpp
@@ -10,19 +10,20 @@
 #include "blackgui/menus/menuaction.h"
 #include "blackgui/views/viewdbobjects.h"
 #include "blackgui/models/aircrafticaolistmodel.h"
+#include "blackgui/models/aircraftcategorylistmodel.h"
 #include "blackgui/models/aircraftmodellistmodel.h"
 #include "blackgui/models/airlineicaolistmodel.h"
 #include "blackgui/models/countrylistmodel.h"
 #include "blackgui/models/distributorlistmodel.h"
 #include "blackgui/models/liverylistmodel.h"
+#include "blackmisc/simulation/aircraftmodellist.h"
+#include "blackmisc/simulation/distributor.h"
+#include "blackmisc/simulation/distributorlist.h"
 #include "blackmisc/aviation/aircrafticaocodelist.h"
 #include "blackmisc/aviation/airlineicaocodelist.h"
 #include "blackmisc/aviation/liverylist.h"
 #include "blackmisc/icons.h"
 #include "blackmisc/countrylist.h"
-#include "blackmisc/simulation/aircraftmodellist.h"
-#include "blackmisc/simulation/distributor.h"
-#include "blackmisc/simulation/distributorlist.h"
 
 #include <QAction>
 #include <QIntValidator>