diff --git a/packages/bbui/src/Form/Core/index.js b/packages/bbui/src/Form/Core/index.js
index 8c309eca85..b8af2ca9e1 100644
--- a/packages/bbui/src/Form/Core/index.js
+++ b/packages/bbui/src/Form/Core/index.js
@@ -1,4 +1,4 @@
 export { default as CoreTextField } from "./TextField.svelte"
 export { default as CoreSelect } from "./Select.svelte"
 export { default as CoreMultiselect } from "./Multiselect.svelte"
-export { default as Checkbox } from "./Checkbox.svelte"
+export { default as CoreCheckbox } from "./Checkbox.svelte"
diff --git a/packages/standard-components/src/forms/BooleanField.svelte b/packages/standard-components/src/forms/BooleanField.svelte
index 6e38c22be4..26db4aa96d 100644
--- a/packages/standard-components/src/forms/BooleanField.svelte
+++ b/packages/standard-components/src/forms/BooleanField.svelte
@@ -1,5 +1,5 @@
 <script>
-  import "@spectrum-css/checkbox/dist/index-vars.css"
+  import { CoreCheckbox } from "@budibase/bbui"
   import Field from "./Field.svelte"
 
   export let field
@@ -9,10 +9,6 @@
 
   let fieldState
   let fieldApi
-
-  const onChange = event => {
-    fieldApi.setValue(event.target.checked)
-  }
 </script>
 
 <Field
@@ -24,37 +20,12 @@
   bind:fieldApi
   defaultValue={false}>
   {#if fieldState}
-    <div class="spectrum-FieldGroup spectrum-FieldGroup--horizontal">
-      <label class="spectrum-Checkbox" class:is-invalid={!$fieldState.valid}>
-        <input
-          checked={$fieldState.value}
-          disabled={$fieldState.disabled}
-          on:change={onChange}
-          type="checkbox"
-          class="spectrum-Checkbox-input"
-          id={$fieldState.fieldId} />
-        <span class="spectrum-Checkbox-box">
-          <svg
-            class="spectrum-Icon spectrum-UIIcon-Checkmark75 spectrum-Checkbox-checkmark"
-            focusable="false"
-            aria-hidden="true">
-            <use xlink:href="#spectrum-css-icon-Checkmark75" />
-          </svg>
-          <svg
-            class="spectrum-Icon spectrum-UIIcon-Dash75 spectrum-Checkbox-partialCheckmark"
-            focusable="false"
-            aria-hidden="true">
-            <use xlink:href="#spectrum-css-icon-Dash75" />
-          </svg>
-        </span>
-        <span class="spectrum-Checkbox-label">{text || 'Checkbox'}</span>
-      </label>
-    </div>
+    <CoreCheckbox
+      value={$fieldState.value}
+      disabled={$fieldState.disabled}
+      error={$fieldState.error}
+      fieldId={$fieldState.fieldId}
+      on:change={e => fieldApi.setValue(e.detail)}
+      {text} />
   {/if}
 </Field>
-
-<style>
-  .spectrum-Checkbox {
-    width: 100%;
-  }
-</style>
diff --git a/packages/standard-components/src/forms/RelationshipField.svelte b/packages/standard-components/src/forms/RelationshipField.svelte
index 3e7ef7b0e6..85643be227 100644
--- a/packages/standard-components/src/forms/RelationshipField.svelte
+++ b/packages/standard-components/src/forms/RelationshipField.svelte
@@ -21,6 +21,8 @@
   $: linkedTableId = fieldSchema?.tableId
   $: fetchRows(linkedTableId)
   $: fetchTable(linkedTableId)
+  $: singleValue = flatten($fieldState?.value)?.[0]
+  $: multiValue = flatten($fieldState?.value) ?? []
 
   const fetchTable = async id => {
     if (id) {
@@ -38,6 +40,13 @@
     }
   }
 
+  const flatten = values => {
+    if (!values) {
+      return []
+    }
+    return values.map(value => (typeof value === "object" ? value._id : value))
+  }
+
   const getDisplayName = row => {
     return row?.[tableDefinition?.primaryDisplay || "_id"] || "-"
   }
@@ -64,7 +73,7 @@
     <svelte:component
       this={multiselect ? CoreMultiselect : CoreSelect}
       {options}
-      value={multiselect ? $fieldState.value : $fieldState.value?.[0]}
+      value={multiselect ? multiValue : singleValue}
       on:change={multiselect ? multiHandler : singleHandler}
       fieldId={$fieldState.fieldId}
       disabled={$fieldState.disabled}