diff --git a/src/gui/settings/dockwidgetsettings.cpp b/src/gui/settings/dockwidgetsettings.cpp
index 60f55c8af..17fbb86be 100644
--- a/src/gui/settings/dockwidgetsettings.cpp
+++ b/src/gui/settings/dockwidgetsettings.cpp
@@ -95,7 +95,7 @@ namespace swift::gui::settings
         case IndexFloatingMargins: return QVariant::fromValue(m_floatingMargins);
         case IndexFloatingFramelessMargins: return QVariant::fromValue(m_floatingFramelessMargins);
         case IndexDockedMargins: return QVariant::fromValue(m_dockedMargins);
-        case IndexFrameless: return QVariant::fromValue(m_floating);
+        case IndexFrameless: return QVariant::fromValue(m_frameless);
         case IndexFloating: return QVariant::fromValue(m_floating);
         default: return CValueObject::propertyByIndex(index);
         }
diff --git a/src/misc/country.cpp b/src/misc/country.cpp
index a45b2ac7c..9878ea9a8 100644
--- a/src/misc/country.cpp
+++ b/src/misc/country.cpp
@@ -137,7 +137,7 @@ namespace swift::misc
         case IndexIso3Code: this->setIso3Code(variant.toString()); break;
         case IndexName: this->setName(variant.toString()); break;
         case IndexAlias1: this->setAlias1(variant.toString()); break;
-        case IndexAlias2: this->setAlias1(variant.toString()); break;
+        case IndexAlias2: this->setAlias2(variant.toString()); break;
         case IndexHistoric: this->setHistoric(variant.toBool()); break;
         default:
             IDatastoreObjectWithStringKey::canHandleIndex(index) ?
diff --git a/src/misc/db/dbinfo.cpp b/src/misc/db/dbinfo.cpp
index f82c6dca4..e081f3a5d 100644
--- a/src/misc/db/dbinfo.cpp
+++ b/src/misc/db/dbinfo.cpp
@@ -87,7 +87,7 @@ namespace swift::misc::db
         switch (i)
         {
         case IndexTableName: this->setTableName(variant.toString()); break;
-        case IndexEntries: this->setTableName(variant.toString()); break;
+        case IndexEntries: this->setEntries(variant.toInt()); break;
         case IndexEntity: this->setEntity(static_cast<CEntityFlags::Entity>(variant.toInt())); break;
         default:
             if (IDatastoreObjectWithIntegerKey::canHandleIndex(index))
diff --git a/src/misc/identifier.cpp b/src/misc/identifier.cpp
index 0b05c33ad..d7bbd0b1e 100644
--- a/src/misc/identifier.cpp
+++ b/src/misc/identifier.cpp
@@ -242,7 +242,7 @@ namespace swift::misc
         case IndexName: return m_name.compare(compareValue.m_name, Qt::CaseInsensitive);
         case IndexMachineIdBase64: return m_machineIdBase64.compare(compareValue.m_machineIdBase64);
         case IndexMachineName: return m_machineName.compare(compareValue.m_machineName, Qt::CaseInsensitive);
-        case IndexMachineId: return m_machineName.compare(compareValue.m_machineName, Qt::CaseInsensitive);
+        case IndexMachineId: return getMachineId().compare(compareValue.getMachineId(), Qt::CaseInsensitive);
         case IndexProcessId: return Compare::compare(m_processId, compareValue.m_processId);
         case IndexProcessName: return m_processName.compare(compareValue.m_processName, Qt::CaseInsensitive);
         case IndexIsFromLocalMachine:
diff --git a/src/misc/simulation/aircraftmatchersetup.cpp b/src/misc/simulation/aircraftmatchersetup.cpp
index 7ef44f966..69e8b31a2 100644
--- a/src/misc/simulation/aircraftmatchersetup.cpp
+++ b/src/misc/simulation/aircraftmatchersetup.cpp
@@ -129,7 +129,7 @@ namespace swift::misc::simulation
         case IndexMsNetworkEntryFile: m_msReverseLookupFile = variant.toString(); break;
         case IndexMsMatchingStageFile: m_msMatchingStageFile = variant.toString(); break;
         case IndexMsNetworkEnabled: m_msReverseEnabled = variant.toBool(); break;
-        case IndexMsMatchingStageEnabled: m_msReverseEnabled = variant.toBool(); break;
+        case IndexMsMatchingStageEnabled: m_msMatchingEnabled = variant.toBool(); break;
         default: break;
         }
         CValueObject::setPropertyByIndex(index, variant);
diff --git a/src/misc/simulation/settings/simulatorsettings.cpp b/src/misc/simulation/settings/simulatorsettings.cpp
index 20d72b798..896d80d5a 100644
--- a/src/misc/simulation/settings/simulatorsettings.cpp
+++ b/src/misc/simulation/settings/simulatorsettings.cpp
@@ -165,7 +165,7 @@ namespace swift::misc::simulation::settings
         switch (i)
         {
         case IndexSimulatorDirectory: this->setSimulatorDirectory(variant.toString()); break;
-        case IndexModelDirectories: this->setSimulatorDirectory(variant.toString()); break;
+        case IndexModelDirectories: this->setModelDirectories(variant.toStringList()); break;
         case IndexComIntegration: this->setComIntegrated(variant.toBool()); break;
         case IndexRecordOwnAircraftGnd: this->setRecordOwnAircraftGnd(variant.toBool()); break;
         case IndexModelExcludeDirectoryPatterns: m_excludeDirectoryPatterns = variant.value<QStringList>(); break;