diff --git a/samples/cliclient/client.cpp b/samples/cliclient/client.cpp
index 2f2263dd0..8442d83aa 100644
--- a/samples/cliclient/client.cpp
+++ b/samples/cliclient/client.cpp
@@ -177,7 +177,8 @@ namespace BlackSample
         QString password;
         args >> hostname >> port >> username >> password;
         args.skipWhiteSpace();
-        emit presetServer(BlackMisc::Network::CServer("", "", hostname, port, BlackMisc::Network::CUser(username, args.readAll(), "", password)));
+        const BlackMisc::Network::CUser user(username, args.readAll(), "", password);
+        emit presetServer(BlackMisc::Network::CServer(hostname, port, user));
     }
 
     void Client::presetCallsignCmd(QTextStream &args)
diff --git a/src/blackcore/data/vatsimsetup.cpp b/src/blackcore/data/vatsimsetup.cpp
index a1c8a1037..1bd99a185 100644
--- a/src/blackcore/data/vatsimsetup.cpp
+++ b/src/blackcore/data/vatsimsetup.cpp
@@ -33,8 +33,7 @@ namespace BlackCore
 
         bool CVatsimSetup::setServers(const CServerList &fsdServers, const CServerList &voiceServers)
         {
-            const bool changed = !this->getVoiceServers().equalsByKeys(voiceServers, &CServer::getName, &CServer::getAddress) ||
-                                 !this->getFsdServers().equalsByKeys(fsdServers, &CServer::getName, &CServer::getAddress);
+            const bool changed = (this->getVoiceServers() != voiceServers || this->getFsdServers() != fsdServers);
             this->setFsdServers(fsdServers);
             this->setVoiceServers(voiceServers);
             return changed;
diff --git a/src/blackcore/vatsim/vatsimdatafilereader.cpp b/src/blackcore/vatsim/vatsimdatafilereader.cpp
index 66cad5b9a..de945d055 100644
--- a/src/blackcore/vatsim/vatsimdatafilereader.cpp
+++ b/src/blackcore/vatsim/vatsimdatafilereader.cpp
@@ -355,7 +355,9 @@ namespace BlackCore
                             if (fsdServerParts.size() < 5) break;
                             if (!fsdServerParts.at(4).trimmed().contains('1')) break; // allowed?
                             const QString description(fsdServerParts.at(2)); // part(3) could be added
-                            const BlackMisc::Network::CServer fsdServer(fsdServerParts.at(0), description, fsdServerParts.at(1), 6809, CUser("id", "real name", "email", "password"));
+                            const CServer fsdServer(fsdServerParts.at(0), description, fsdServerParts.at(1), 6809,
+                                                    CUser("id", "real name", "email", "password"),
+                                                    CFsdSetup::vatsimStandard(), CEcosystem(CEcosystem::VATSIM), CServer::FSDServerVatsim);
                             fsdServers.push_back(fsdServer);
                         }
                         break;
@@ -365,7 +367,9 @@ namespace BlackCore
                             const QStringList voiceServerParts = currentLine.split(':');
                             if (voiceServerParts.size() < 3) break;
                             if (!voiceServerParts.at(3).trimmed().contains('1')) break; // allowed?
-                            const BlackMisc::Network::CServer voiceServer(voiceServerParts.at(1), voiceServerParts.at(2), voiceServerParts.at(0), -1, CUser());
+                            const CServer voiceServer(voiceServerParts.at(1), voiceServerParts.at(2), voiceServerParts.at(0), -1,
+                                                      CUser(),
+                                                      CFsdSetup(), CEcosystem(CEcosystem::VATSIM), CServer::VoiceServerVatsim);
                             voiceServers.push_back(voiceServer);
                         }
                         break;
@@ -377,7 +381,6 @@ namespace BlackCore
                 } // for each line
 
                 // Setup for VATSIM servers and sorting for comparison
-                fsdServers.setFsdSetup(CFsdSetup::vatsimStandard());
                 fsdServers.sortBy(&CServer::getName, &CServer::getDescription);
                 voiceServers.sortBy(&CServer::getName, &CServer::getDescription);