diff --git a/libs/common/src/tools/state/buffered-state.ts b/libs/common/src/tools/state/buffered-state.ts
index b10ee6c7b85..c53390e4af7 100644
--- a/libs/common/src/tools/state/buffered-state.ts
+++ b/libs/common/src/tools/state/buffered-state.ts
@@ -45,12 +45,14 @@ export class BufferedState<Input, Output, Dependency> implements SingleUserState
       map((dependency) => [key.shouldOverwrite(dependency), dependency] as const),
     );
     const overwrite$ = combineLatest([hasValue$, overwriteDependency$]).pipe(
-      concatMap(async ([hasValue, [shouldOverwrite, dependency]]) => {
-        if (hasValue && shouldOverwrite) {
-          await this.overwriteOutput(dependency);
-        }
-        return [false, null] as const;
-      }),
+      concatMap(
+        async ([hasValue, [shouldOverwrite, dependency]]): Promise<readonly [false, null]> => {
+          if (hasValue && shouldOverwrite) {
+            await this.overwriteOutput(dependency);
+          }
+          return [false, null] as const;
+        },
+      ),
     );
 
     // drive overwrites only when there's a subscription;
@@ -71,7 +73,7 @@ export class BufferedState<Input, Output, Dependency> implements SingleUserState
   private async overwriteOutput(dependency: Dependency) {
     // take the latest value from the buffer
     let buffered: Input;
-    await this.bufferedState.update((state) => {
+    await this.bufferedState.update((state): Input | null => {
       buffered = state ?? null;
       return null;
     });
diff --git a/libs/tools/generator/extensions/legacy/src/legacy-password-generation.service.ts b/libs/tools/generator/extensions/legacy/src/legacy-password-generation.service.ts
index 41dcb94a001..02e86ad8fe0 100644
--- a/libs/tools/generator/extensions/legacy/src/legacy-password-generation.service.ts
+++ b/libs/tools/generator/extensions/legacy/src/legacy-password-generation.service.ts
@@ -345,7 +345,8 @@ export class LegacyPasswordGenerationService implements PasswordGenerationServic
       timeout({
         // timeout after 1 second
         each: 1000,
-        with() {
+        // TODO(PM-22309): Typescript 5.8 update, confirm type
+        with(): any[] {
           return [];
         },
       }),
@@ -370,7 +371,8 @@ export class LegacyPasswordGenerationService implements PasswordGenerationServic
       timeout({
         // timeout after 1 second
         each: 1000,
-        with() {
+        // TODO(PM-22309): Typescript 5.8 update, confirm type
+        with(): any[] {
           return [];
         },
       }),