diff --git a/src/blackgui/atcstationlistmodel.cpp b/src/blackgui/atcstationlistmodel.cpp
index 11cb6bd06..8f5b60fe0 100644
--- a/src/blackgui/atcstationlistmodel.cpp
+++ b/src/blackgui/atcstationlistmodel.cpp
@@ -35,6 +35,7 @@ namespace BlackGui
         this->m_columns.clear();
         switch (stationMode)
         {
+        case NotSet:
         case StationsOnline:
             this->m_columns.addColumn(CColumn("callsign", CAtcStation::IndexCallsignAsStringAsSet));
             this->m_columns.addColumn(CColumn("distance", CAtcStation::IndexDistance,  Qt::AlignRight  | Qt::AlignVCenter));
@@ -61,6 +62,10 @@ namespace BlackGui
             this->setSortColumnByPropertyIndex(CAtcStation::IndexBookedFrom);
             this->m_sortOrder = Qt::AscendingOrder;
             break;
+
+        default:
+            qFatal("Wrong mode");
+            break;
         }
     }
 }
diff --git a/src/blackgui/userlistmodel.cpp b/src/blackgui/userlistmodel.cpp
index 2e5fd3a6e..078ba8061 100644
--- a/src/blackgui/userlistmodel.cpp
+++ b/src/blackgui/userlistmodel.cpp
@@ -31,6 +31,7 @@ namespace BlackGui
         this->m_columns.clear();
         switch (userMode)
         {
+        case NotSet:
         case UserDetailed:
             this->m_columns.addColumn(CColumn("", CUser::IndexCallsignIcon));
             this->m_columns.addColumn(CColumn("realname", CUser::IndexRealName));
@@ -44,6 +45,10 @@ namespace BlackGui
             this->m_columns.addColumn(CColumn("realname", CUser::IndexRealName));
             this->m_columns.addColumn(CColumn("callsign", CUser::IndexCallsign));
             break;
+
+        default:
+            qFatal("Wrong mode");
+            break;
         }
     }
 
diff --git a/src/blackmisc/avcallsign.cpp b/src/blackmisc/avcallsign.cpp
index 24ce0f2b0..ed8a05233 100644
--- a/src/blackmisc/avcallsign.cpp
+++ b/src/blackmisc/avcallsign.cpp
@@ -71,10 +71,8 @@ namespace BlackMisc
          */
         bool CCallsign::equalsString(const QString &callsignString) const
         {
-            if (callsignString.isEmpty()) return false;
-            if (this->isEmpty()) return false;
-            if (callsignString == this->m_callsign || callsignString == this->m_callsignAsSet) return true;
-            return false;
+            CCallsign other(callsignString);
+            return other == (*this);
         }
 
         /*