diff --git a/.gitignore b/.gitignore
index 0a2aabec1..255fe57ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,4 @@
 /Avalonia_Apps/.packages/*.nupkg
 /.github/upgrades/scenarios/sdk-style-conversion/tasks/01-convert-csv-viewer
 /CSharpBible/Libraries/Libraries.Package/artifacts/nuget
+/JC-AMS/Core/Resource/Version.inc
diff --git a/JC-AMS/Core.Tests/Core.Tests.csproj b/JC-AMS/Core.Tests/Core.Tests.csproj
index 1f247c1b5..3dfb59df4 100644
--- a/JC-AMS/Core.Tests/Core.Tests.csproj
+++ b/JC-AMS/Core.Tests/Core.Tests.csproj
@@ -9,15 +9,15 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk">
-      <Version>18.3.0</Version>
+      <Version>18.7.0</Version>
     </PackageReference>
     <PackageReference Include="MSTest">
-      <Version>4.1.0</Version>
+      <Version>4.3.0</Version>
     </PackageReference>
     <PackageReference Include="coverlet.collector">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <Version>8.0.1</Version>
+      <Version>10.0.1</Version>
     </PackageReference>
   </ItemGroup>
 
diff --git a/JC-AMS/Core/Core.csproj b/JC-AMS/Core/Core.csproj
index 8bf0ebf4f..6877ffd77 100644
--- a/JC-AMS/Core/Core.csproj
+++ b/JC-AMS/Core/Core.csproj
@@ -31,14 +31,14 @@
 		  <Version>4.9.1</Version>
 		</PackageReference>
 		<PackageReference Include="System.IO.Ports">
-		  <Version>10.0.5</Version>
+		  <Version>10.0.9</Version>
 		</PackageReference>
 		<PackageReference Condition="'$(TargetFramework)'=='net60-windows'" Include="System.Data.Common" />
 		<PackageReference Include="System.ServiceProcess.ServiceController">
-		  <Version>10.0.5</Version>
+		  <Version>10.0.9</Version>
 		</PackageReference>
 		<PackageReference Include="System.Management">
-		  <Version>10.0.5</Version>
+		  <Version>10.0.9</Version>
 		</PackageReference>
 		<PackageReference Include="System.Text.RegularExpressions">
 		  <Version>4.3.1</Version>
diff --git a/JC-AMS/Core/Core/System/CSubStation.cs b/JC-AMS/Core/Core/System/CSubStation.cs
index 9eea1eedc..7d6b4a7f1 100644
--- a/JC-AMS/Core/Core/System/CSubStation.cs
+++ b/JC-AMS/Core/Core/System/CSubStation.cs
@@ -89,6 +89,8 @@ public class CSubStation : CPropNotificationClass, IHasParent , IHasID , IXmlSer
         /// </summary>
         /// <autogeneratedoc />
         public static Dictionary<long, CSubStation> SubStations = new Dictionary<long, CSubStation>();
+
+        private static readonly object SubStationsSync = new object();
         #endregion
 
         #region Interface properties
@@ -137,7 +139,11 @@ public CSubStation(CStation cStation, long idSubstation, string sDescription)
             Station = cStation;
             this.idSubStation = idSubstation;
             Description = sDescription;
-            SubStations[idSubStation] = this;
+
+            lock (SubStationsSync)
+            {
+                SubStations[idSubStation] = this;
+            }
         }
 
         /// <summary>
@@ -149,10 +155,13 @@ public CSubStation(CStation cStation, long idSubstation, string sDescription)
         /// <autogeneratedoc />
         private void OnChangeIdSubStation(long oldId, long newId, string name)
         {
-            if (oldId > 0)
-                RemoveSubStation(oldId);
-            if (newId > 0)
-                SubStations[newId] = this;
+            lock (SubStationsSync)
+            {
+                if (oldId > 0)
+                    SubStations.Remove(oldId);
+                if (newId > 0)
+                    SubStations[newId] = this;
+            }
         }
 
         /// <summary>
@@ -163,7 +172,10 @@ private void OnChangeIdSubStation(long oldId, long newId, string name)
         /// <autogeneratedoc />
         private static void RemoveSubStation(long oldId)
         {
-            SubStations.Remove(oldId);
+            lock (SubStationsSync)
+            {
+                SubStations.Remove(oldId);
+            }
         }
 
         #region Interface methods
@@ -249,7 +261,10 @@ public void WriteXml(XmlWriter writer)
         /// <autogeneratedoc />
         public static CSubStation GetSubStationGetStation(long idSubStation)
         {
-            return SubStations.ContainsKey(idSubStation) ? SubStations[idSubStation] : null;
+            lock (SubStationsSync)
+            {
+                return SubStations.ContainsKey(idSubStation) ? SubStations[idSubStation] : null;
+            }
         }
         #endregion
         #endregion