diff --git a/src/blackcore/fsd/addatc.cpp b/src/blackcore/fsd/addatc.cpp
index 7b607291a..b82dde389 100644
--- a/src/blackcore/fsd/addatc.cpp
+++ b/src/blackcore/fsd/addatc.cpp
@@ -48,8 +48,8 @@ namespace BlackCore
                 return {};
             }
 
-            AtcRating rating = static_cast<AtcRating>(tokens[5].toInt());
-            int protocolRevision = tokens[6].toInt();
+            const AtcRating rating = fromQString<AtcRating>(tokens[5]);
+            const int protocolRevision = tokens[6].toInt();
             return AddAtc(tokens[0], tokens[2], tokens[3], tokens[4], rating, protocolRevision);
         }
     }
diff --git a/src/blackcore/fsd/addpilot.cpp b/src/blackcore/fsd/addpilot.cpp
index d57b4dca3..6fba8ab03 100644
--- a/src/blackcore/fsd/addpilot.cpp
+++ b/src/blackcore/fsd/addpilot.cpp
@@ -46,10 +46,10 @@ namespace BlackCore
                 return {};
             }
 
-            PilotRating rating = static_cast<PilotRating>(tokens[4].toInt());
-            int protocolRevision = tokens[5].toInt();
-            SimType simType = static_cast<SimType>(tokens[6].toInt());
-            AddPilot packet(tokens[0], tokens[2], tokens[3], rating, protocolRevision, simType, tokens[7]);
+            const PilotRating rating = fromQString<PilotRating>(tokens[4]);
+            const int protocolRevision = tokens[5].toInt();
+            const SimType simType = fromQString<SimType>(tokens[6]);
+            const AddPilot packet(tokens[0], tokens[2], tokens[3], rating, protocolRevision, simType, tokens[7]);
             return packet;
         }
     }
diff --git a/src/blackcore/fsd/pilotdataupdate.cpp b/src/blackcore/fsd/pilotdataupdate.cpp
index 56dbb4174..38ce15135 100644
--- a/src/blackcore/fsd/pilotdataupdate.cpp
+++ b/src/blackcore/fsd/pilotdataupdate.cpp
@@ -12,6 +12,7 @@
 
 #include "blackmisc/logmessage.h"
 
+using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 
 namespace BlackCore
@@ -61,7 +62,7 @@ namespace BlackCore
         {
             if (tokens.size() < 10)
             {
-                BlackMisc::CLogMessage(static_cast<PilotDataUpdate *>(nullptr)).debug(u"Wrong number of arguments.");
+                CLogMessage(static_cast<PilotDataUpdate *>(nullptr)).debug(u"Wrong number of arguments.");
                 return {};
             }