diff --git a/client/next.config.mjs b/client/next.config.mjs
index ae5f8869..745a4215 100644
--- a/client/next.config.mjs
+++ b/client/next.config.mjs
@@ -5,6 +5,15 @@ const nextConfig = {
   images: {
     domains: ["api.mapbox.com"],
   },
+  // webpack: (config) => {
+  //   // Fixes warning Critical dependency: the request of a dependency is an expression
+  //   config.module = {
+  //     ...config.module,
+  //     exprContextCritical: false,
+  //   };
+
+  //   return config;
+  // },
 };
 
 export default nextConfig;
diff --git a/client/src/components/map/layers/countries-layer/index.tsx b/client/src/components/map/layers/countries-layer/index.tsx
index 740899c9..6d004a12 100644
--- a/client/src/components/map/layers/countries-layer/index.tsx
+++ b/client/src/components/map/layers/countries-layer/index.tsx
@@ -27,7 +27,8 @@ const CountriesLayer = ({ beforeId, dataset, config, onAdd, onRemove }: Countrie
       data: {
         type: "FeatureCollection",
         features: countriesData.data.data.map((c) => ({
-          ...(c.attributes?.geometry as Feature),
+          type: "Feature",
+          geometry: c.attributes?.geometry as Feature["geometry"],
           properties: {
             id: c.id,
             name: c.attributes?.name,
diff --git a/client/src/constants/map.ts b/client/src/constants/map.ts
index ef8f7c58..4afae46a 100644
--- a/client/src/constants/map.ts
+++ b/client/src/constants/map.ts
@@ -88,6 +88,6 @@ export const DEFAULT_MAP_SETTINGS: {
 } = {
   basemap: "basemap-light",
   labels: "labels-dark",
-  boundaries: true,
-  roads: true,
+  boundaries: false,
+  roads: false,
 };
diff --git a/cms/config/middlewares.ts b/cms/config/middlewares.ts
index 3ab20d95..79ec3c04 100644
--- a/cms/config/middlewares.ts
+++ b/cms/config/middlewares.ts
@@ -5,7 +5,17 @@ export default [
   'strapi::poweredBy',
   'strapi::logger',
   'strapi::query',
-  'strapi::body',
+  {
+    name: "strapi::body",
+    config: {
+      formLimit: "256mb", // modify form body
+      jsonLimit: "256mb", // modify JSON body
+      textLimit: "256mb", // modify text body
+      formidable: {
+        maxFileSize: 250 * 1024 * 1024, // multipart data, modify here limit of uploaded file size
+      },
+    },
+  },
   'strapi::session',
   'strapi::favicon',
   'strapi::public',
diff --git a/cms/config/plugins.ts b/cms/config/plugins.ts
index 91996b43..9c7c5c79 100644
--- a/cms/config/plugins.ts
+++ b/cms/config/plugins.ts
@@ -1,4 +1,9 @@
 module.exports = ({ env }) => ({
+  upload: {
+    config: {
+      sizeLimit: 250 * 1024 * 1024 // 256mb in bytes
+    },
+  },
   'config-sync': {
     enabled: true,
     config: {