diff --git a/src/Tgstation.Server.Host/Components/Engine/WindowsByondInstaller.cs b/src/Tgstation.Server.Host/Components/Engine/WindowsByondInstaller.cs
index 4020ed97cf..2c3aad65bc 100644
--- a/src/Tgstation.Server.Host/Components/Engine/WindowsByondInstaller.cs
+++ b/src/Tgstation.Server.Host/Components/Engine/WindowsByondInstaller.cs
@@ -130,14 +130,19 @@ namespace Tgstation.Server.Host.Components.Engine
 			CheckVersionValidity(version);
 			ArgumentNullException.ThrowIfNull(path);
 
+			var noPromptTrustedTask = SetNoPromptTrusted(path, cancellationToken);
+			var installDirectXTask = InstallDirectX(path, cancellationToken);
 			var tasks = new List<ValueTask>(3)
 			{
-				SetNoPromptTrusted(path, cancellationToken),
-				InstallDirectX(path, cancellationToken),
+				noPromptTrustedTask,
+				installDirectXTask,
 			};
 
 			if (!generalConfiguration.SkipAddingByondFirewallException)
-				tasks.Add(AddDreamDaemonToFirewall(version, path, cancellationToken));
+			{
+				var firewallTask = AddDreamDaemonToFirewall(version, path, cancellationToken);
+				tasks.Add(firewallTask);
+			}
 
 			return ValueTaskExtensions.WhenAll(tasks);
 		}
diff --git a/tests/Tgstation.Server.Tests/Live/Instance/EngineTest.cs b/tests/Tgstation.Server.Tests/Live/Instance/EngineTest.cs
index 626f9628c3..a2f8249544 100644
--- a/tests/Tgstation.Server.Tests/Live/Instance/EngineTest.cs
+++ b/tests/Tgstation.Server.Tests/Live/Instance/EngineTest.cs
@@ -134,17 +134,12 @@ namespace Tgstation.Server.Tests.Live.Instance
 					cancellationToken),
 				ErrorCode.ModelValidationFailure);
 		public static int EngineInstallationTimeout(EngineVersion testVersion)
-		{
-			switch (testVersion.Engine.Value)
+			=> testVersion.Engine.Value switch
 			{
-				case EngineType.Byond:
-					return 30;
-				case EngineType.OpenDream:
-					return 500;
-				default:
-					throw new InvalidOperationException($"Unknown engine type: {testVersion.Engine.Value}");
-			}
-		}
+				EngineType.Byond => 30,
+				EngineType.OpenDream => 500,
+				_ => throw new InvalidOperationException($"Unknown engine type: {testVersion.Engine.Value}"),
+			};
 
 		int EngineInstallationTimeout() => EngineInstallationTimeout(testVersion);