diff --git a/.eslintrc.js b/.eslintrc.js
index a6eaf41b8d..e7a5016ad4 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,4 +1,15 @@
 module.exports = {
   parser: "babel-eslint",
   extends: "@trbl",
+  rules: {
+    "import/no-unresolved": [
+      2,
+      {
+        ignore: [
+          'payload/config',
+          'payload/unsanitizedConfig',
+        ]
+      }
+    ],
+  },
 };
diff --git a/demo/payload.config.js b/demo/payload.config.js
index d9e8dd482d..e37d6fa1b2 100644
--- a/demo/payload.config.js
+++ b/demo/payload.config.js
@@ -69,7 +69,6 @@ module.exports = {
   paths: {
     scss: path.resolve(__dirname, 'client/scss/overrides.scss'),
   },
-  mongoURL: 'mongodb://localhost/payload',
   graphQL: {
     mutations: {},
     queries: {},
diff --git a/demo/server.js b/demo/server.js
index 52b0b97f41..ebfab49b01 100644
--- a/demo/server.js
+++ b/demo/server.js
@@ -11,7 +11,7 @@ const payload = new Payload({
     provider: 'mock',
   },
   secret: 'SECRET_KEY',
-  mongoURL: 'mongodb://localhost/payload',
+  mongoURL: 'mongodb://localhost/test',
   express: expressApp,
 });
 
diff --git a/src/client/components/forms/DraggableSection/ActionPanel/index.js b/src/client/components/forms/DraggableSection/ActionPanel/index.js
index c44385ad01..7599539e84 100644
--- a/src/client/components/forms/DraggableSection/ActionPanel/index.js
+++ b/src/client/components/forms/DraggableSection/ActionPanel/index.js
@@ -114,6 +114,7 @@ ActionPanel.defaultProps = {
   verticalAlignment: 'center',
   blockType: null,
   isHovered: false,
+  blocks: [],
 };
 
 ActionPanel.propTypes = {
@@ -121,6 +122,9 @@ ActionPanel.propTypes = {
   addRow: PropTypes.func.isRequired,
   removeRow: PropTypes.func.isRequired,
   blockType: PropTypes.oneOf(['blocks', 'array']),
+  blocks: PropTypes.arrayOf(
+    PropTypes.shape({}),
+  ),
   verticalAlignment: PropTypes.oneOf(['top', 'center', 'sticky']),
   isHovered: PropTypes.bool,
   rowIndex: PropTypes.number.isRequired,
diff --git a/src/localization/plugin.js b/src/localization/plugin.js
index 6c38eb0247..52a4ee1cd9 100644
--- a/src/localization/plugin.js
+++ b/src/localization/plugin.js
@@ -44,7 +44,7 @@ module.exports = function localizationPlugin(schema, options) {
         const locale = owner.getLocale();
         const localeSubDoc = this.$__getValue(path);
 
-        if (localeSubDoc === null || localeSubDoc === void 0) {
+        if (localeSubDoc === null || localeSubDoc === undefined) {
           return localeSubDoc;
         }