diff --git a/packages/runtime/src/client/crud-types.ts b/packages/runtime/src/client/crud-types.ts
index 91011428..c2696069 100644
--- a/packages/runtime/src/client/crud-types.ts
+++ b/packages/runtime/src/client/crud-types.ts
@@ -693,7 +693,7 @@ type ScalarCreatePayload<
     | MapModelFieldType<Schema, Model, Field>
     | (FieldIsArray<Schema, Model, Field> extends true
           ? {
-                set?: MapModelFieldType<Schema, Model, Field>[];
+                set?: MapModelFieldType<Schema, Model, Field>;
             }
           : never);
 
@@ -1203,7 +1203,7 @@ type NestedUpsertInput<
     Field extends RelationFields<Schema, Model>,
 > = OrArray<
     {
-        where: WhereUniqueInput<Schema, Model>;
+        where: WhereUniqueInput<Schema, RelationFieldType<Schema, Model, Field>>;
         create: CreateInput<
             Schema,
             RelationFieldType<Schema, Model, Field>,
diff --git a/packages/runtime/src/client/index.ts b/packages/runtime/src/client/index.ts
index bafc558e..aaf50754 100644
--- a/packages/runtime/src/client/index.ts
+++ b/packages/runtime/src/client/index.ts
@@ -4,4 +4,6 @@ export type * from './crud-types';
 export * from './errors';
 export type { ClientOptions } from './options';
 export { definePlugin } from './plugin';
+export type { ZenStackPromise } from './promise';
 export type { ToKysely } from './query-builder';
+export { sql } from 'kysely';