diff --git a/ReallifeGamemode.DataService/ReallifeGamemode.DataService.csproj b/ReallifeGamemode.DataService/ReallifeGamemode.DataService.csproj
index 4907947c..525dabbf 100644
--- a/ReallifeGamemode.DataService/ReallifeGamemode.DataService.csproj
+++ b/ReallifeGamemode.DataService/ReallifeGamemode.DataService.csproj
@@ -19,8 +19,8 @@
 
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.11" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.1.11" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.3" />
     <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="2.2.12" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
diff --git a/ReallifeGamemode.Database/ReallifeGamemode.Database.csproj b/ReallifeGamemode.Database/ReallifeGamemode.Database.csproj
index d397affe..7da0f914 100644
--- a/ReallifeGamemode.Database/ReallifeGamemode.Database.csproj
+++ b/ReallifeGamemode.Database/ReallifeGamemode.Database.csproj
@@ -7,12 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.11" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.11">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.4" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.1" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.Design" Version="1.1.2" />
   </ItemGroup>
 
diff --git a/ReallifeGamemode.Server.Core.Events/ReallifeGamemode.Server.Core.Events.csproj b/ReallifeGamemode.Server.Core.Events/ReallifeGamemode.Server.Core.Events.csproj
index 13a1a551..ac00adb8 100644
--- a/ReallifeGamemode.Server.Core.Events/ReallifeGamemode.Server.Core.Events.csproj
+++ b/ReallifeGamemode.Server.Core.Events/ReallifeGamemode.Server.Core.Events.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/ReallifeGamemode.Server.Core/ReallifeGamemode.Server.Core.csproj b/ReallifeGamemode.Server.Core/ReallifeGamemode.Server.Core.csproj
index 7f399cc9..135235d5 100644
--- a/ReallifeGamemode.Server.Core/ReallifeGamemode.Server.Core.csproj
+++ b/ReallifeGamemode.Server.Core/ReallifeGamemode.Server.Core.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/ReallifeGamemode.Server.Log/ReallifeGamemode.Server.Log.csproj b/ReallifeGamemode.Server.Log/ReallifeGamemode.Server.Log.csproj
index 392a6be8..5a3694df 100644
--- a/ReallifeGamemode.Server.Log/ReallifeGamemode.Server.Log.csproj
+++ b/ReallifeGamemode.Server.Log/ReallifeGamemode.Server.Log.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.3" />
   </ItemGroup>
 
 </Project>
diff --git a/ReallifeGamemode.Server/Managers/ATMManager.cs b/ReallifeGamemode.Server/Managers/ATMManager.cs
index 84c77b17..9682af3e 100644
--- a/ReallifeGamemode.Server/Managers/ATMManager.cs
+++ b/ReallifeGamemode.Server/Managers/ATMManager.cs
@@ -24,7 +24,7 @@ namespace ReallifeGamemode.Server.Managers
       var addedATMs = 0;
       using (var dbContext = new DatabaseContext())
       {
-        foreach (var currentATM in dbContext.Blips)
+        foreach (var currentATM in dbContext.Blips.ToList())
         {
           if (currentATM.Sprite == 500)
           {
diff --git a/ReallifeGamemode.Server/Managers/VehicleManager.cs b/ReallifeGamemode.Server/Managers/VehicleManager.cs
index f366d345..3a1041d8 100644
--- a/ReallifeGamemode.Server/Managers/VehicleManager.cs
+++ b/ReallifeGamemode.Server/Managers/VehicleManager.cs
@@ -865,7 +865,7 @@ namespace ReallifeGamemode.Server.Managers
     }
 
     [ServerEvent(Event.VehicleDeath)]
-    public static async Task VehicleManagerVehicleDeath(Vehicle vehicle)
+    public static void VehicleManagerVehicleDeath(Vehicle vehicle)
     {
       ServerVehicle serverVehicle = GetServerVehicleFromVehicle(vehicle);
 
@@ -876,7 +876,6 @@ namespace ReallifeGamemode.Server.Managers
         return;
       }
       Vehicle newVeh = serverVehicle.Spawn(vehicle);
-      await Task.Delay(2000);
       newVeh.Repair();
       newVeh.Rotation = new Vector3(0, 0, serverVehicle.Heading);
 
diff --git a/ReallifeGamemode.Server/ReallifeGamemode.Server.csproj b/ReallifeGamemode.Server/ReallifeGamemode.Server.csproj
index 4259a105..ca32bea0 100644
--- a/ReallifeGamemode.Server/ReallifeGamemode.Server.csproj
+++ b/ReallifeGamemode.Server/ReallifeGamemode.Server.csproj
@@ -18,9 +18,12 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.11" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.11" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.1.11" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.3" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.10" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>