diff --git a/build/lib/nls.ts b/build/lib/nls.ts
index fcba7ac6e5e20b0bf56f7c0966c4d0e8bd4ad17b..856470107eccec0994b82f97f09a0b659c2d2568 100644
--- a/build/lib/nls.ts
+++ b/build/lib/nls.ts
@@ -227,7 +227,7 @@ module nls {
 		// `localize` named imports
 		const allLocalizeImportDeclarations = importDeclarations
 			.filter(d => d.importClause.namedBindings.kind === ts.SyntaxKind.NamedImports)
-			.map(d => (<ts.NamedImports>d.importClause.namedBindings).elements)
+			.map(d => [].concat((<ts.NamedImports>d.importClause.namedBindings).elements))
 			.flatten();
 
 		// `localize` read-only references
diff --git a/build/monaco/package.json b/build/monaco/package.json
index c31756516c7e2a85aa458128892de453d154de9a..4cc3beb09b828f7db630c486b11c7a1fb5a83e77 100644
--- a/build/monaco/package.json
+++ b/build/monaco/package.json
@@ -48,7 +48,7 @@
     "sinon": "^1.17.2",
     "source-map": "^0.4.4",
     "tslint": "^4.3.1",
-    "typescript": "2.4.1",
+    "typescript": "2.5.2",
     "typescript-formatter": "4.0.1",
     "underscore": "^1.8.2",
     "vinyl": "^0.4.5",
diff --git a/build/package.json b/build/package.json
index cb36cf063de628feb0f8574c4dd7d4bf8f0214f6..d94f9aad64ae70c083a5e49004597a9a4886b970 100644
--- a/build/package.json
+++ b/build/package.json
@@ -13,7 +13,7 @@
     "documentdb": "^1.11.0",
     "mime": "^1.3.4",
     "minimist": "^1.2.0",
-    "typescript": "2.4.1",
+    "typescript": "2.5.2",
     "xml2js": "^0.4.17"
   },
   "scripts": {
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 92a71b1697a25af07ed33285005325b6ed008fa1..729f5bd71e50c3118a3af695141c79ada1f240f7 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -82,7 +82,7 @@ function findGitDarwin(): Promise<IGit> {
 
 			function getVersion(path: string) {
 				// make sure git executes
-				cp.exec('git --version', (err, stdout: Buffer) => {
+				cp.exec('git --version', (err: Error, stdout: any) => {
 					if (err) {
 						return e('git not found');
 					}
diff --git a/package.json b/package.json
index 83d7c8955a06c5dd1062ab6f18834774a58dae94..09c0745bbdeaae724ec35a532c7bbcaae8291e77 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
     "sinon": "^1.17.2",
     "source-map": "^0.4.4",
     "tslint": "^4.3.1",
-    "typescript": "2.4.1",
+    "typescript": "^2.5.2",
     "typescript-formatter": "4.0.1",
     "uglify-es": "^3.0.18",
     "underscore": "^1.8.2",