diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/index.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/index.svelte
index 3dd64cfc71..7c6d886548 100644
--- a/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/index.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/index.svelte
@@ -36,6 +36,6 @@
 <style>
   .explanationModalContent {
     max-width: 300px;
-    padding: 16px 12px 0px;
+    padding: 16px 12px 2px;
   }
 </style>
diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/subjects/DatesAsNumbers.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/subjects/DatesAsNumbers.svelte
index 31d0c980ee..0c851d77a2 100644
--- a/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/subjects/DatesAsNumbers.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/subjects/DatesAsNumbers.svelte
@@ -25,7 +25,7 @@
 
 <Subject heading="Dates as Numbers">
   <Section>
-    A date can be used in place of a numeric value, but it will be parsed as a UNIX epoch timestamp, which is the number of milliseconds since Jan 1st 1970. A more recent Date/Time will be a higher number.
+    A date can be used in place of a numeric value, but it will be parsed as a <Block>UNIX epoch</Block> timestamp, which is the number of milliseconds since Jan 1st 1970. A more recent moment in time will be a higher number.
   </Section>
 
   <Section>
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 1192a93375..9afcbc5c6c 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -5284,7 +5284,7 @@
           {
             "type": "field",
             "label": "Data column",
-            "key": "valueColumns",
+            "key": "valueColumn",
             "dependsOn": "dataSource",
             "required": true
           }
@@ -5309,7 +5309,7 @@
           {
             "type": "field",
             "label": "Data column",
-            "key": "valueColumns",
+            "key": "valueColumn",
             "dependsOn": "dataSource",
             "required": true
           }
@@ -5381,7 +5381,7 @@
           {
             "type": "field",
             "label": "Value column",
-            "key": "valueColumns",
+            "key": "valueColumn",
             "dependsOn": "dataSource",
             "required": true
           },
@@ -5533,7 +5533,8 @@
             "type": "field",
             "label": "Date column",
             "key": "dateColumn",
-            "dependsOn": "dataSource"
+            "dependsOn": "dataSource",
+            "required": true
           },
           {
             "type": "field",
diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index 9581ffa5d4..323d196395 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -273,8 +273,9 @@
     staticSettings = instanceSettings.staticSettings
     dynamicSettings = instanceSettings.dynamicSettings
 
+    console.log(settingsDefinition, settingsDefinitionMap);
     // Check if we have any missing required settings
-    missingRequiredSettings = settingsDefinition.filter(setting => {
+    missingRequiredSettings = Object.values(settingsDefinitionMap).filter(setting => {
       let empty = instance[setting.key] == null || instance[setting.key] === ""
       let missing = setting.required && empty
 
@@ -283,13 +284,21 @@
         const dependsOnKey = setting.dependsOn.setting || setting.dependsOn
         const dependsOnValue = setting.dependsOn.value
         const realDependentValue = instance[dependsOnKey]
+        let foo = false && instance._component === "@budibase/standard-components/chartblock" && setting.type === "multifield"
+        if (foo) {
+          console.log(setting)
+          console.log(instance);
+        }
         if (dependsOnValue === undefined && realDependentValue) {
+          if (foo) console.log("in 0");
           return missing
         }
         if (dependsOnValue == null && realDependentValue == null) {
+          if (foo) console.log("in 1");
           return false
         }
         if (dependsOnValue !== realDependentValue) {
+          if (foo) console.log("in 2");
           return false
         }
       }
diff --git a/packages/client/src/components/app/blocks/ChartBlock.svelte b/packages/client/src/components/app/blocks/ChartBlock.svelte
index 9ea054391b..2767c44b8e 100644
--- a/packages/client/src/components/app/blocks/ChartBlock.svelte
+++ b/packages/client/src/components/app/blocks/ChartBlock.svelte
@@ -24,7 +24,7 @@
   export let width
 
   // Pie/Donut
-  // export let valueColumn
+  export let valueColumn
 
   // Bar
   export let stacked
@@ -78,7 +78,7 @@
           width,
           title: chartTitle,
           labelColumn,
-          valueColumn: valueColumns,
+          valueColumn,
           valueColumns,
           palette,
           dataLabels,
diff --git a/packages/client/src/components/app/charts/BarChart.svelte b/packages/client/src/components/app/charts/BarChart.svelte
index 532ce11306..764394316a 100644
--- a/packages/client/src/components/app/charts/BarChart.svelte
+++ b/packages/client/src/components/app/charts/BarChart.svelte
@@ -111,7 +111,7 @@
         if (!useDates) {
           const value = get(row, column);
 
-          if (schema[column].type === 'datetime') {
+          if (schema?.[column]?.type === 'datetime') {
             return Date.parse(value)
           }