diff --git a/src/dsstats.api/Hubs/UploadHub.cs b/src/dsstats.api/Hubs/UploadHub.cs
index 47725f93..a77ebed9 100644
--- a/src/dsstats.api/Hubs/UploadHub.cs
+++ b/src/dsstats.api/Hubs/UploadHub.cs
@@ -25,7 +25,7 @@ public async Task DecodeRequest(Guid guid)
 
         decodeService.DecodeFinished += decodeEventHandler;
 
-        var timeoutTask = Task.Delay(20000);
+        var timeoutTask = Task.Delay(25000);
 
         var completedTask = await Task.WhenAny(completionSource.Task, timeoutTask);
 
@@ -67,7 +67,7 @@ public async Task DecodeRawRequest(Guid guid)
 
         decodeService.DecodeRawFinished += decodeEventHandler;
 
-        var timeoutTask = Task.Delay(20000);
+        var timeoutTask = Task.Delay(25000);
 
         var completedTask = await Task.WhenAny(completionSource.Task, timeoutTask);
 
diff --git a/src/dsstats.api/dsstats.api.sln b/src/dsstats.api/dsstats.api.sln
new file mode 100644
index 00000000..a66b0366
--- /dev/null
+++ b/src/dsstats.api/dsstats.api.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.2.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dsstats.api", "dsstats.api.csproj", "{97694AC4-1EFB-7B86-C32A-B24CC6D5BEC9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{97694AC4-1EFB-7B86-C32A-B24CC6D5BEC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97694AC4-1EFB-7B86-C32A-B24CC6D5BEC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97694AC4-1EFB-7B86-C32A-B24CC6D5BEC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{97694AC4-1EFB-7B86-C32A-B24CC6D5BEC9}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {CDB63AA8-0210-44C7-9269-7B4C2F35E5DA}
+	EndGlobalSection
+EndGlobal
diff --git a/src/dsstats.decode/DecodeService.cs b/src/dsstats.decode/DecodeService.cs
index 8eb5fab8..f4206d48 100644
--- a/src/dsstats.decode/DecodeService.cs
+++ b/src/dsstats.decode/DecodeService.cs
@@ -43,7 +43,7 @@ private async Task<int> SaveAndQueueFiles(Guid guid, List<IFormFile> files, bool
             logger.LogInformation("Saved uploaded replay to temp: {path}", tempPath);
 
             // Prepare job
-            var job = new ReplayJob(Guid.NewGuid(), tempPath, "", inHouse);
+            var job = new ReplayJob(guid, tempPath, "", inHouse);
             
             // Try enqueue
             if (!replayQueue.TryEnqueue(job))
@@ -53,7 +53,7 @@ private async Task<int> SaveAndQueueFiles(Guid guid, List<IFormFile> files, bool
             }
         }
 
-        return replayQueue.QueueLength;
+        return 1;
     }
 
     public static ReplayMetadata GetMetaData(Sc2Replay replay)