diff --git a/packages/effect-fc/src/Form.ts b/packages/effect-fc/src/Form.ts
index 5c37310..564d8f4 100644
--- a/packages/effect-fc/src/Form.ts
+++ b/packages/effect-fc/src/Form.ts
@@ -186,9 +186,9 @@ export declare namespace make {
 export const make = Effect.fnUntraced(function* <A, I = A, R = never, MA = void, ME = never, MR = never, MP = never>(
     options: make.Options<A, I, R, MA, ME, MR, MP>
 ): Effect.fn.Return<
-    RootForm<A, I, R, MA, ME, Result.forkEffect.OutputContext<MA, ME, MR, MP>, MP>,
+    RootForm<A, I, R, MA, ME, Result.forkEffect.OutputContext<MR, MP>, MP>,
     never,
-    Scope.Scope | R | Result.forkEffect.OutputContext<MA, ME, MR, MP>
+    Scope.Scope | R | Result.forkEffect.OutputContext<MR, MP>
 > {
     const mutation = yield* Mutation.make(options)
     const valueLens = Lens.fromSubscriptionRef(yield* SubscriptionRef.make(Option.none<A>()))
@@ -230,9 +230,9 @@ export declare namespace service {
 export const service = <A, I = A, R = never, MA = void, ME = never, MR = never, MP = never>(
     options: service.Options<A, I, R, MA, ME, MR, MP>
 ): Effect.Effect<
-    RootForm<A, I, R, MA, ME, Result.forkEffect.OutputContext<MA, ME, MR, MP>, MP>,
+    RootForm<A, I, R, MA, ME, Result.forkEffect.OutputContext<MR, MP>, MP>,
     never,
-    Scope.Scope | R | Result.forkEffect.OutputContext<MA, ME, MR, MP>
+    Scope.Scope | R | Result.forkEffect.OutputContext<MR, MP>
 > => Effect.tap(
     make(options),
     form => Effect.forkScoped(form.run),
diff --git a/packages/effect-fc/src/Mutation.ts b/packages/effect-fc/src/Mutation.ts
index be4b71e..2f3a730 100644
--- a/packages/effect-fc/src/Mutation.ts
+++ b/packages/effect-fc/src/Mutation.ts
@@ -111,12 +111,12 @@ export declare namespace make {
 export const make = Effect.fnUntraced(function* <const K extends Mutation.AnyKey = never, A = void, E = never, R = never, P = never>(
     options: make.Options<K, A, E, R, P>
 ): Effect.fn.Return<
-    Mutation<K, A, E, Result.forkEffect.OutputContext<A, E, R, P>, P>,
+    Mutation<K, A, E, Result.forkEffect.OutputContext<R, P>, P>,
     never,
-    Scope.Scope | Result.forkEffect.OutputContext<A, E, R, P>
+    Scope.Scope | Result.forkEffect.OutputContext<R, P>
 > {
     return new MutationImpl(
-        yield* Effect.context<Scope.Scope | Result.forkEffect.OutputContext<A, E, R, P>>(),
+        yield* Effect.context<Scope.Scope | Result.forkEffect.OutputContext<R, P>>(),
         options.f as any,
         options.initialProgress as P,