diff --git a/.eslintrc.js b/.eslintrc.js
index 906b808e41..3e80d3c5cd 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -2,6 +2,7 @@ module.exports = {
 	globals: {
 		SCOPE_VERSION: true,
 		TRANSLATIONS: true,
+		oc_userconfig: true
 	},
 	extends: [
 		'@nextcloud'
diff --git a/Makefile b/Makefile
index 2cf5a8419b..4c9e5fa909 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ all: dev-setup lint stylelint build-js-production test
 dev-setup: clean clean-dev npm-init
 
 npm-init:
-	npm install
+	npm ci
 
 npm-update:
 	npm update
diff --git a/package-lock.json b/package-lock.json
index 1e75032192..d608449e8c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9172,7 +9172,8 @@
 					"dependencies": {
 						"minimist": {
 							"version": "1.2.0",
-							"resolved": "",
+							"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
 							"optional": true
 						}
 					}
@@ -9532,9 +9533,9 @@
 			}
 		},
 		"glob": {
-			"version": "7.1.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-			"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+			"version": "7.1.6",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+			"integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
 			"requires": {
 				"fs.realpath": "^1.0.0",
 				"inflight": "^1.0.4",
diff --git a/package.json b/package.json
index a0d0cba2c0..0939e65e7d 100644
--- a/package.json
+++ b/package.json
@@ -75,6 +75,7 @@
 		"file-loader": "^6.0.0",
 		"gettext-extractor": "^3.5.2",
 		"gettext-parser": "^4.0.2",
+		"glob": "^7.1.6",
 		"iconfont-plugin-webpack": "^1.1.4",
 		"jest": "^25.1.0",
 		"jest-environment-jsdom-sixteen": "^1.0.0",
diff --git a/styleguide/global.requires.js b/styleguide/global.requires.js
index 305292af08..6e264f61ee 100644
--- a/styleguide/global.requires.js
+++ b/styleguide/global.requires.js
@@ -1,4 +1,5 @@
-import '@babel/polyfill'
+import 'core-js/stable'
+import 'regenerator-runtime/runtime'
 import Vue from 'vue'
 import VTooltip from './../src/directives/Tooltip'