diff --git a/packages/cli/package.json b/packages/cli/package.json
index 9487955da..e8a366c21 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -54,7 +54,7 @@
         "sails-disk": "^1.0.1",
         "ts-jest": "^23.10.1",
         "tslint": "^5.11.0",
-        "typescript": "~3.3.0"
+        "typescript": "~3.5.2"
     },
     "dependencies": {
         "body-parser": "^1.18.3",
diff --git a/packages/cli/src/Db.ts b/packages/cli/src/Db.ts
index cb0ce3f91..f65792973 100644
--- a/packages/cli/src/Db.ts
+++ b/packages/cli/src/Db.ts
@@ -61,8 +61,12 @@ export async function init(): Promise<IDatabaseCollections> {
 
 	await createConnection(connectionOptions);
 
+	// TODO: Fix that properly
+	// @ts-ignore
 	collections.Credentials = getRepository(entities.CredentialsEntity);
+	// @ts-ignore
 	collections.Execution = getRepository(entities.ExecutionEntity);
+	// @ts-ignore
 	collections.Workflow = getRepository(entities.WorkflowEntity);
 
 	return collections;
diff --git a/packages/core/package.json b/packages/core/package.json
index 004872d15..c4445de9d 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -34,7 +34,7 @@
         "source-map-support": "^0.5.9",
         "ts-jest": "^23.10.1",
         "tslint": "^5.11.0",
-        "typescript": "~3.3.0"
+        "typescript": "~3.5.2"
     },
     "dependencies": {
         "crypto-js": "^3.1.9-1",
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 486021f95..fd4bfbd3f 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -34,7 +34,7 @@
     "@vue/cli-plugin-babel": "^3.8.0",
     "@vue/cli-plugin-e2e-cypress": "^3.8.0",
     "@vue/cli-plugin-eslint": "^3.8.0",
-    "@vue/cli-plugin-typescript": "~3.2.0",
+    "@vue/cli-plugin-typescript": "~3.8.1",
     "@vue/cli-plugin-unit-jest": "^3.8.0",
     "@vue/cli-service": "^3.8.0",
     "@vue/eslint-config-standard": "^4.0.0",
@@ -62,7 +62,7 @@
     "string-template-parser": "^1.2.6",
     "ts-jest": "^23.10.1",
     "tslint": "^5.17.0",
-    "typescript": "~3.3.0",
+    "typescript": "~3.5.2",
     "vue": "^2.6.9",
     "vue-cli-plugin-webpack-bundle-analyzer": "^1.3.0",
     "vue-json-pretty": "^1.4.1",
diff --git a/packages/editor-ui/src/components/Node.vue b/packages/editor-ui/src/components/Node.vue
index 00b5c01f2..6266cc466 100644
--- a/packages/editor-ui/src/components/Node.vue
+++ b/packages/editor-ui/src/components/Node.vue
@@ -62,15 +62,13 @@ export default mixins(nodeBase).extend({
 		NodeIcon,
 	},
 	computed: {
-		workflowResultDataNode (): ITaskData[] | null {
-			return this.$store.getters.getWorkflowResultDataByNodeName(this.data.name);
-		},
 		workflowDataItems () {
-			if (this.workflowResultDataNode === null) {
+			const workflowResultDataNode = this.$store.getters.getWorkflowResultDataByNodeName(this.data.name);
+			if (workflowResultDataNode === null) {
 				return 0;
 			}
 
-			return this.workflowResultDataNode.length;
+			return workflowResultDataNode.length;
 		},
 		isExecuting (): boolean {
 			return this.$store.getters.executingNode === this.data.name;
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 5c4b33860..7ee24a01c 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -42,7 +42,7 @@
 		"n8n-core": "^0.1.0",
 		"n8n-workflow": "^0.1.0",
         "replace-in-file": "^4.1.0",
-        "typescript": "~3.3.0",
+        "typescript": "~3.5.2",
         "vorpal": "^1.12.0"
     }
 }
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index eb7a38554..2ec5950ec 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -105,7 +105,7 @@
         "n8n-workflow": "^0.1.0",
         "ts-jest": "^23.10.1",
         "tslint": "^5.11.0",
-        "typescript": "~3.3.0"
+        "typescript": "~3.5.2"
     },
     "dependencies": {
         "basic-auth": "^2.0.1",
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index cb706c68e..6ba840da9 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -30,7 +30,7 @@
         "jest": "^23.6.0",
         "ts-jest": "^23.10.1",
         "tslint": "^5.11.0",
-        "typescript": "~3.3.0"
+        "typescript": "~3.5.2"
     },
     "dependencies": {
         "lodash.get": "^4.4.2",