diff --git a/app/src/data/fields/NumberField.ts b/app/src/data/fields/NumberField.ts
index b2e4516..0f7481f 100644
--- a/app/src/data/fields/NumberField.ts
+++ b/app/src/data/fields/NumberField.ts
@@ -52,7 +52,7 @@ export class NumberField<Required extends true | false = false> extends Field<
 
       switch (context) {
          case "submit":
-            return Number.parseInt(value);
+            return Number.parseInt(value, 10);
       }
 
       return value;
diff --git a/app/src/data/helper.ts b/app/src/data/helper.ts
index 12c531b..12120d8 100644
--- a/app/src/data/helper.ts
+++ b/app/src/data/helper.ts
@@ -28,7 +28,7 @@ export function getChangeSet(
          const value = _value === "" ? null : _value;
 
          // normalize to null if undefined
-         const newValue = field.getValue(value, "submit") || null;
+         const newValue = field.getValue(value, "submit") ?? null;
          // @todo: add typing for "action"
          if (action === "create" || newValue !== data[key]) {
             acc[key] = newValue;
diff --git a/app/src/modes/shared.ts b/app/src/modes/shared.ts
index 92973dc..6b226c2 100644
--- a/app/src/modes/shared.ts
+++ b/app/src/modes/shared.ts
@@ -87,7 +87,7 @@ export async function makeModeConfig<
    const { typesFilePath, configFilePath, writer, syncSecrets: syncSecretsOptions } = config;
 
    const isProd = config.isProduction ?? _isProd();
-   const plugins = appConfig?.options?.plugins ?? ([] as AppPlugin[]);
+   const plugins = config?.options?.plugins ?? ([] as AppPlugin[]);
    const syncFallback = typeof config.syncSchema === "boolean" ? config.syncSchema : !isProd;
    const syncSchemaOptions =
       typeof config.syncSchema === "object"