diff --git a/src/blackgui/components/dbaircrafticaocomponent.h b/src/blackgui/components/dbaircrafticaocomponent.h
index 138d217f3..0d9d7f005 100644
--- a/src/blackgui/components/dbaircrafticaocomponent.h
+++ b/src/blackgui/components/dbaircrafticaocomponent.h
@@ -22,6 +22,7 @@
 #include <QScopedPointer>
 
 class QWidget;
+
 namespace BlackMisc { namespace Aviation { class CAircraftIcaoCode; } }
 namespace Ui { class CDbAircraftIcaoComponent; }
 namespace BlackGui
@@ -44,7 +45,7 @@ namespace BlackGui
             explicit CDbAircraftIcaoComponent(QWidget *parent = nullptr);
 
             //! Destructor
-            ~CDbAircraftIcaoComponent();
+            virtual ~CDbAircraftIcaoComponent();
 
             //! Get the view
             BlackGui::Views::CAircraftIcaoCodeView *view() const;
diff --git a/src/blackgui/models/modelfilter.cpp b/src/blackgui/models/modelfilter.cpp
index b78f97f1b..8913bc729 100644
--- a/src/blackgui/models/modelfilter.cpp
+++ b/src/blackgui/models/modelfilter.cpp
@@ -8,7 +8,6 @@
  */
 
 #include "blackgui/models/modelfilter.h"
-
 #include <QtGlobal>
 
 namespace BlackGui
@@ -52,7 +51,7 @@ namespace BlackGui
             }
 
             // should never happen
-            Q_ASSERT(false);
+            qFatal("Illegal state");
             return false;
         }