diff --git a/Torch.Server/Program.cs b/Torch.Server/Program.cs
index 3e10b1e..2e36d46 100644
--- a/Torch.Server/Program.cs
+++ b/Torch.Server/Program.cs
@@ -63,7 +63,7 @@ namespace Torch.Server
             // Breaks on Windows Server 2019
             if (!new ComputerInfo().OSFullName.Contains("Server 2019") && !Environment.UserInteractive)
             {
-                using (var service = new TorchService())
+                using (var service = new TorchService(args))
                     ServiceBase.Run(service);
                 return;
             }
diff --git a/Torch.Server/TorchService.cs b/Torch.Server/TorchService.cs
index e33fda3..b43064e 100644
--- a/Torch.Server/TorchService.cs
+++ b/Torch.Server/TorchService.cs
@@ -15,9 +15,11 @@ namespace Torch.Server
         public const string Name = "Torch (SEDS)";
         private TorchServer _server;
         private Initializer _initializer;
+        private string[] _args;
 
-        public TorchService()
+        public TorchService(string[] args)
         {
+            _args = args;
             var workingDir = new FileInfo(typeof(TorchService).Assembly.Location).Directory.ToString();
             Directory.SetCurrentDirectory(workingDir);
             _initializer = new Initializer(workingDir);
@@ -29,11 +31,11 @@ namespace Torch.Server
         }
 
         /// <inheritdoc />
-        protected override void OnStart(string[] args)
+        protected override void OnStart(string[] _)
         {
-            base.OnStart(args);
+            base.OnStart(_args);
 
-            _initializer.Initialize(args);
+            _initializer.Initialize(_args);
             _initializer.Run();
         }
 
diff --git a/Torch/VRageGame.cs b/Torch/VRageGame.cs
index 0f0530f..4f95c4d 100644
--- a/Torch/VRageGame.cs
+++ b/Torch/VRageGame.cs
@@ -199,7 +199,8 @@ namespace Torch
                 }
                 MyRenderProxy.Initialize(renderer);
                 MyRenderProfiler.SetAutocommit(false);
-                MyRenderProfiler.InitMemoryHack("MainEntryPoint");
+                //This broke services?
+                //MyRenderProfiler.InitMemoryHack("MainEntryPoint");
             }
 
             // Loads object builder serializers. Intuitive, right?