diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte
index 9a5eaef83a..063ca34633 100644
--- a/packages/builder/src/components/backend/DataTable/DataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte
@@ -31,7 +31,7 @@
 
 <Table {title} {schema} {data} allowEditing={true} {loading}>
   <CreateColumnButton />
-  {#if Object.keys(schema).length > 0}
+  {#if schema && Object.keys(schema).length > 0}
     <CreateRowButton />
     <CreateViewButton />
     <ExportButton view={tableView} />
diff --git a/packages/server/src/api/controllers/application.js b/packages/server/src/api/controllers/application.js
index 512299c5c8..f05430e05a 100644
--- a/packages/server/src/api/controllers/application.js
+++ b/packages/server/src/api/controllers/application.js
@@ -79,7 +79,10 @@ exports.fetch = async function(ctx) {
   if (apps.length === 0) {
     ctx.body = []
   } else {
-    ctx.body = await Promise.all(apps)
+    const response = await Promise.allSettled(apps)
+    ctx.body = response
+      .filter(result => result.status === "fulfilled")
+      .map(({ value }) => value)
   }
 }
 
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index f3c7272490..3f5273cf9e 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -36,7 +36,7 @@
   "gitHead": "284cceb9b703c38566c6e6363c022f79a08d5691",
   "dependencies": {
     "@budibase/bbui": "^1.50.1",
-    "@budibase/svelte-ag-grid": "^0.0.13",
+    "@budibase/svelte-ag-grid": "^0.0.16",
     "@fortawesome/fontawesome-free": "^5.14.0",
     "@svelteschool/svelte-forms": "^0.7.0",
     "apexcharts": "^3.22.1",
diff --git a/packages/standard-components/src/DataGrid/Component.svelte b/packages/standard-components/src/DataGrid/Component.svelte
index 0d80990513..369d7bb2d2 100644
--- a/packages/standard-components/src/DataGrid/Component.svelte
+++ b/packages/standard-components/src/DataGrid/Component.svelte
@@ -140,12 +140,6 @@
   }
 </script>
 
-<svelte:head>
-  <link
-    rel="stylesheet"
-    href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css" />
-</svelte:head>
-
 <div class="container" style="--grid-height: {height}px">
   {#if dataLoaded}
     {#if canAddDelete}
diff --git a/packages/standard-components/src/index.js b/packages/standard-components/src/index.js
index 98bdc28028..3dec13e27b 100644
--- a/packages/standard-components/src/index.js
+++ b/packages/standard-components/src/index.js
@@ -1,4 +1,5 @@
 import "@budibase/bbui/dist/bbui.css"
+import "flatpickr/dist/flatpickr.css"
 
 export { default as container } from "./Container.svelte"
 export { default as text } from "./Text.svelte"