diff --git a/waspc/data/Generator/templates/sdk/wasp/auth/useAuth.ts b/waspc/data/Generator/templates/sdk/wasp/auth/useAuth.ts
index 1149fb9ad..a08b3958f 100644
--- a/waspc/data/Generator/templates/sdk/wasp/auth/useAuth.ts
+++ b/waspc/data/Generator/templates/sdk/wasp/auth/useAuth.ts
@@ -23,8 +23,6 @@ function createUserGetter(): Query<void, AuthUser | null> {
     try {
       const response = await api.get(getMeRoute.path)
       const userData = superjsonDeserialize<AuthUserData | null>(response.data)
-      // TODO: figure out why overloading is not working
-      // @ts-ignore
       return makeAuthUserIfPossible(userData)
     } catch (error) {
       if (error.response?.status === 401) {
diff --git a/waspc/data/Generator/templates/sdk/wasp/client/operations/hooks.ts b/waspc/data/Generator/templates/sdk/wasp/client/operations/hooks.ts
index 6070e0d6a..7ac0aac46 100644
--- a/waspc/data/Generator/templates/sdk/wasp/client/operations/hooks.ts
+++ b/waspc/data/Generator/templates/sdk/wasp/client/operations/hooks.ts
@@ -211,11 +211,9 @@ function makeOptimisticUpdateMutationFn<Input, Output, CachedData>(
   return (function performActionWithOptimisticUpdates(item: Input) {
     const specificOptimisticUpdateDefinitions = optimisticUpdateDefinitions.map(
       (generalDefinition) =>
-        // @ts-ignore
         getOptimisticUpdateDefinitionForSpecificItem(generalDefinition, item)
     );
     return (actionFn as InternalAction<Input, Output>).internal(
-      // @ts-ignore
       item,
       specificOptimisticUpdateDefinitions
     );
@@ -273,7 +271,6 @@ function makeRqOptimisticUpdateOptions<ActionInput, CachedData>(
 
       // Attempt to optimistically update the cache using the new value.
       try {
-        // @ts-ignore
         queryClient.setQueryData(queryKey, updateQuery);
       } catch (e) {
         console.error(
diff --git a/waspc/data/Generator/templates/sdk/wasp/client/operations/queries/core.ts b/waspc/data/Generator/templates/sdk/wasp/client/operations/queries/core.ts
index 44153ff62..0f593848b 100644
--- a/waspc/data/Generator/templates/sdk/wasp/client/operations/queries/core.ts
+++ b/waspc/data/Generator/templates/sdk/wasp/client/operations/queries/core.ts
@@ -18,7 +18,7 @@ import {
 // Details here: https://github.com/wasp-lang/wasp/issues/2017
 export function makeQueryCacheKey<Input, Output>(
   query: Query<Input, Output>,
-  payload?: Input
+  payload: Input
 ): (string | Input)[] {
   return payload !== undefined ?
     [...query.queryCacheKey, payload]
diff --git a/waspc/data/Generator/templates/sdk/wasp/client/operations/rpc.ts b/waspc/data/Generator/templates/sdk/wasp/client/operations/rpc.ts
index ee03a976a..4775639ef 100644
--- a/waspc/data/Generator/templates/sdk/wasp/client/operations/rpc.ts
+++ b/waspc/data/Generator/templates/sdk/wasp/client/operations/rpc.ts
@@ -93,4 +93,4 @@ type ClientOperationWithNonAnyInput<Input, Output> =
   ? (args?: unknown) => Promise<Output>
   : [Input] extends [void]
   ? () => Promise<Output>
-  : (args?: Input) => Promise<Output>
+  : (args: Input) => Promise<Output>