diff --git a/Torch.API/Torch.API.csproj b/Torch.API/Torch.API.csproj
index 9ae0e18..30dd9fd 100644
--- a/Torch.API/Torch.API.csproj
+++ b/Torch.API/Torch.API.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6-windows</TargetFramework>
-    <LangVersion>10</LangVersion>
+    <TargetFramework>net7-windows</TargetFramework>
     <AssemblyTitle>Torch API</AssemblyTitle>
     <Product>Torch</Product>
     <Copyright>Copyright © Torch API 2017</Copyright>
@@ -17,7 +16,7 @@
   
   <ItemGroup>
     <PackageReference Include="JorgeSerrano.Json.JsonSnakeCaseNamingPolicy" Version="0.9.0" />
-    <PackageReference Include="NLog" Version="5.0.4" />
+    <PackageReference Include="NLog" Version="5.0.5" />
     <PackageReference Include="SemanticVersioning" Version="2.0.2" />
     <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.201.13">
       <PrivateAssets>all</PrivateAssets>
diff --git a/Torch.Server.Tests/Torch.Server.Tests.csproj b/Torch.Server.Tests/Torch.Server.Tests.csproj
index 5456dfb..a17cd59 100644
--- a/Torch.Server.Tests/Torch.Server.Tests.csproj
+++ b/Torch.Server.Tests/Torch.Server.Tests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6-windows</TargetFramework>
-    <LangVersion>10</LangVersion>
+    <TargetFramework>net7-windows</TargetFramework>
     <NoWarn>1591,0649</NoWarn>
     <AssemblyTitle>Torch Server Tests</AssemblyTitle>
     <Product>Torch</Product>
@@ -18,8 +17,8 @@
   </PropertyGroup>
 <!--   <Import Project="$(SolutionDir)\TransformOnBuild.targets" /> -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="NLog" Version="5.0.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="NLog" Version="5.0.5" />
     <PackageReference Include="xunit" Version="2.4.2" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Torch.Server/Managers/InstanceManager.cs b/Torch.Server/Managers/InstanceManager.cs
index a39e19d..0849374 100644
--- a/Torch.Server/Managers/InstanceManager.cs
+++ b/Torch.Server/Managers/InstanceManager.cs
@@ -90,8 +90,7 @@ namespace Torch.Server.Managers
                 }
                 catch (Exception ex)
                 {
-                    Log.Error("Failed to load world at path: " + f);
-                    continue;
+                    Log.Error(ex, "Failed to load world at path: " + f);
                 }
             }
 
@@ -137,7 +136,7 @@ namespace Torch.Server.Managers
             }
             catch (Exception ex)
             {
-                Log.Error("Failed to load world at path: " + worldPath);
+                Log.Error(ex, "Failed to load world at path: " + worldPath);
                 DedicatedConfig.LoadWorld = null;
                 return;
             }
diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj
index 5ead82f..9e7f812 100644
--- a/Torch.Server/Torch.Server.csproj
+++ b/Torch.Server/Torch.Server.csproj
@@ -1,21 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6-windows</TargetFramework>
+    <TargetFramework>net7-windows</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <LangVersion>10</LangVersion>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <PublishUrl>publish\</PublishUrl>
     <UseApplicationTrust>false</UseApplicationTrust>
     <AssemblyTitle>Torch Server</AssemblyTitle>
     <Product>Torch</Product>
     <Copyright>Copyright © Torch API 2017</Copyright>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <OutputPath>..\bin\$(Platform)\$(Configuration)\</OutputPath>
     <UseWPF>true</UseWPF>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     <NeutralLanguage>en</NeutralLanguage>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
+    <TieredPGO>true</TieredPGO>
   </PropertyGroup>
   
   <PropertyGroup>
@@ -35,22 +33,22 @@
   <ItemGroup>
     <PackageReference Include="AutoCompleteTextBox" Version="1.6.0" />
     <PackageReference Include="Ben.Demystifier" Version="0.4.1" />
-    <PackageReference Include="ControlzEx" Version="5.0.1" />
+    <PackageReference Include="ControlzEx" Version="5.0.2" />
     <PackageReference Include="MahApps.Metro" Version="2.4.9" />
-    <PackageReference Include="MdXaml" Version="1.16.0" />
-    <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="2.2.332302" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="6.0.0" />
-    <PackageReference Include="NLog" Version="5.0.4" />
+    <PackageReference Include="MdXaml" Version="1.16.2" />
+    <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="2.2.343001" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="7.0.0" />
+    <PackageReference Include="NLog" Version="5.0.5" />
     <PackageReference Include="PropertyChanged.Fody" Version="4.0.3" PrivateAssets="all" />
     <PackageReference Include="Steamworks.NET" Version="20.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>compile</IncludeAssets>
     </PackageReference>
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <PackageReference Include="System.Management" Version="6.0.0" />
+    <PackageReference Include="System.Management" Version="7.0.0" />
     <PackageReference Include="nulastudio.NetCoreBeauty" Version="1.2.9.3" />
     <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.201.13">
       <PrivateAssets>all</PrivateAssets>
diff --git a/Torch.Tests/Torch.Tests.csproj b/Torch.Tests/Torch.Tests.csproj
index 6fad7af..5009d52 100644
--- a/Torch.Tests/Torch.Tests.csproj
+++ b/Torch.Tests/Torch.Tests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6-windows</TargetFramework>
-    <LangVersion>10</LangVersion>
+    <TargetFramework>net7-windows</TargetFramework>
     <NoWarn>1591,0649</NoWarn>
     <AssemblyTitle>Torch Tests</AssemblyTitle>
     <Product>Torch</Product>
@@ -18,8 +17,8 @@
   </PropertyGroup>
 <!--   <Import Project="$(SolutionDir)\TransformOnBuild.targets" /> -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="NLog" Version="5.0.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="NLog" Version="5.0.5" />
     <PackageReference Include="xunit" Version="2.4.2" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Torch/Managers/PatchManager/DecoratedMethod.cs b/Torch/Managers/PatchManager/DecoratedMethod.cs
index e24fd04..e880059 100644
--- a/Torch/Managers/PatchManager/DecoratedMethod.cs
+++ b/Torch/Managers/PatchManager/DecoratedMethod.cs
@@ -21,8 +21,6 @@ namespace Torch.Managers.PatchManager
 {
     internal class DecoratedMethod : MethodRewritePattern
     {
-        private static Action<ILHook, bool> IsAppliedSetter;
-
         [ReflectedMethodInfo(typeof(MethodBase), nameof(MethodBase.GetMethodFromHandle), Parameters = new[] {typeof(RuntimeMethodHandle)})]
         private static MethodInfo _getMethodFromHandle = null!;
         
@@ -37,10 +35,6 @@ namespace Torch.Managers.PatchManager
         internal DecoratedMethod(MethodBase method) : base(null)
         {
             _method = method;
-            if (IsAppliedSetter == null)
-            {
-                IsAppliedSetter = typeof(ILHook).GetProperty(nameof(ILHook.IsApplied)).CreateSetter<ILHook, bool>();
-            }
         }
 
         internal bool HasChanged()
@@ -62,16 +56,14 @@ namespace Torch.Managers.PatchManager
                 _log.Log(PrintMode != 0 ? LogLevel.Info : LogLevel.Debug,
                     $"Begin patching {_method.DeclaringType?.FullName}#{_method.Name}({string.Join(", ", _method.GetParameters().Select(x => x.ParameterType.Name))})");
 
-                if (_hook == null)
-                    _hook = new ILHook(_method, Manipulator, new ILHookConfig {ManualApply = true});
-                IsAppliedSetter(_hook, false);
+                _hook ??= new ILHook(_method, Manipulator, false);
                 try
                 {
                     _hook.Apply();
                 }
                 catch (InvalidProgramException e)
                 {
-                    IsAppliedSetter(_hook, false);
+                    _hook.Undo();
                     PrintMode = PrintModeEnum.Emitted | PrintModeEnum.Original;
                     try
                     {
diff --git a/Torch/Patches/ScriptCompilerPatch.cs b/Torch/Patches/ScriptCompilerPatch.cs
index a87c701..6e42373 100644
--- a/Torch/Patches/ScriptCompilerPatch.cs
+++ b/Torch/Patches/ScriptCompilerPatch.cs
@@ -112,7 +112,7 @@ namespace Torch.Patches
                 do
                 {
                     ins[i] = new(OpCodes.Nop);
-                } while (ins[--i].OpCode.OperandType != OperandType.ShortInlineBrTarget);
+                } while (ins[--i].OpCode.FlowControl != FlowControl.Cond_Branch);
 
                 ins[index] = new(OpCodes.Ret);
             }
diff --git a/Torch/Plugins/AssemblyRewriter.cs b/Torch/Plugins/AssemblyRewriter.cs
index 43bb4a4..a0030c6 100644
--- a/Torch/Plugins/AssemblyRewriter.cs
+++ b/Torch/Plugins/AssemblyRewriter.cs
@@ -62,7 +62,7 @@ internal static class AssemblyRewriter
     {
         using var module = ModuleDefinition.ReadModule(inputStream, new()
         {
-            AssemblyResolver = _zipResolver
+            AssemblyResolver = resolver
         });
         foreach (var fieldDefinition in FindAllToRewrite(module))
         {
diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj
index bf6070b..6b45e06 100644
--- a/Torch/Torch.csproj
+++ b/Torch/Torch.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6-windows</TargetFramework>
-    <LangVersion>10</LangVersion>
+    <TargetFramework>net7-windows</TargetFramework>
     <AssemblyTitle>Torch</AssemblyTitle>
     <Product>Torch</Product>
     <Copyright>Copyright © Torch API 2017</Copyright>
@@ -22,15 +21,15 @@
   <Import Project="..\Torch.Mod\Torch.Mod.projitems" Label="Shared" />
   
   <ItemGroup>
-    <PackageReference Include="ControlzEx" Version="5.0.1" />
-    <PackageReference Include="HarmonyX" Version="2.10.0" />
+    <PackageReference Include="ControlzEx" Version="5.0.2" />
+    <PackageReference Include="HarmonyX" Version="2.10.2-prerelease" />
     <PackageReference Include="InfoOf.Fody" Version="2.1.1" PrivateAssets="all" />
     <PackageReference Include="MahApps.Metro" Version="2.4.9" />
     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.3.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
-    <PackageReference Include="MonoMod.RuntimeDetour" Version="22.5.1.1" />
-    <PackageReference Include="NLog" Version="5.0.4" />
-    <PackageReference Include="PropertyChanged.Fody" Version="4.0.3" PrivateAssets="all" />
+    <PackageReference Include="MonoModReorg.RuntimeDetour" Version="22.11.17-prerelease.1" />
+    <PackageReference Include="NLog" Version="5.0.5" />
+    <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
     <PackageReference Include="protobuf-net" Version="2.4.7" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="Torch.SixLabors.ImageSharp" Version="1.0.0-beta6" />