diff --git a/apps/server/src/orchestration/Layers/OrchestrationEngine.ts b/apps/server/src/orchestration/Layers/OrchestrationEngine.ts
index ddd1718faf..903d259f94 100644
--- a/apps/server/src/orchestration/Layers/OrchestrationEngine.ts
+++ b/apps/server/src/orchestration/Layers/OrchestrationEngine.ts
@@ -62,6 +62,11 @@ function commandToAggregateRef(command: OrchestrationCommand): {
         aggregateKind: "project",
         aggregateId: command.projectId,
       };
+    case "thread.branch-from-checkpoint":
+      return {
+        aggregateKind: "thread",
+        aggregateId: command.newThreadId,
+      };
     default:
       return {
         aggregateKind: "thread",
diff --git a/apps/server/src/server.ts b/apps/server/src/server.ts
index 0f36e74818..15945a4370 100644
--- a/apps/server/src/server.ts
+++ b/apps/server/src/server.ts
@@ -298,6 +298,6 @@ export const makeServerLayer = Layer.unwrap(
 // satisfied at runtime by PersistenceLayerLive. This is a known TS inference limitation with Effect layers.
 export const runServer = Layer.launch(makeServerLayer) as unknown as Effect.Effect<
   never,
-  any,
+  never,
   ServerConfig
 >;
diff --git a/apps/server/src/workflow/Services/WorkflowService.ts b/apps/server/src/workflow/Services/WorkflowService.ts
index 3be0171fb4..649cfefb98 100644
--- a/apps/server/src/workflow/Services/WorkflowService.ts
+++ b/apps/server/src/workflow/Services/WorkflowService.ts
@@ -302,12 +302,10 @@ const makeWorkflowService = Effect.gen(function* () {
     }).pipe(Effect.orDie);
 
   const deleteTemplate: WorkflowServiceShape["delete"] = (input) =>
-    Effect.gen(function* () {
-      yield* sql`
-        DELETE FROM workflow_templates
-        WHERE id = ${input.templateId} AND is_built_in = 0
-      `;
-    }).pipe(Effect.orDie);
+    sql`
+      DELETE FROM workflow_templates
+      WHERE id = ${input.templateId} AND is_built_in = 0
+    `.pipe(Effect.orDie);
 
   const execute: WorkflowServiceShape["execute"] = (input) =>
     Effect.gen(function* () {