diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json
index 5ce1076a04b8c03031033b2f03bfbc3739faa3f2..7aa5f175c7098f318025f616032b0148b3df83a2 100644
--- a/src/tsconfig.strictNullChecks.json
+++ b/src/tsconfig.strictNullChecks.json
@@ -170,6 +170,7 @@
 		"./vs/code/electron-main/sharedProcess.ts",
 		"./vs/code/electron-main/theme.ts",
 		"./vs/code/node/cli.ts",
+		"./vs/code/node/cliProcessMain.ts",
 		"./vs/code/node/paths.ts",
 		"./vs/code/node/shellEnv.ts",
 		"./vs/code/node/wait.ts",
@@ -670,6 +671,7 @@
 		"./vs/workbench/parts/terminal/node/terminalProcess.ts",
 		"./vs/workbench/parts/terminal/node/terminalProcessExtHostProxy.ts",
 		"./vs/workbench/parts/terminal/node/windowsShellHelper.ts",
+		"./vs/workbench/parts/terminal/test/electron-browser/terminalColorRegistry.test.ts",
 		"./vs/workbench/parts/terminal/test/node/terminalCommandTracker.test.ts",
 		"./vs/workbench/parts/url/electron-browser/url.contribution.ts",
 		"./vs/workbench/parts/webview/electron-browser/webviewProtocols.ts",
@@ -792,8 +794,7 @@
 		"./vs/workbench/services/title/common/titleService.ts",
 		"./vs/workbench/services/workspace/common/workspaceEditing.ts",
 		"./vs/workbench/test/common/editor/editorOptions.test.ts",
-		"./vs/workbench/test/electron-browser/api/mock.ts",
-		"./vs/workbench/parts/terminal/test/electron-browser/terminalColorRegistry.test.ts"
+		"./vs/workbench/test/electron-browser/api/mock.ts"
 	],
 	"exclude": [
 		"./typings/require-monaco.d.ts"
diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index 67fe22445f5006b5a5ed9b72d06edb3a7351ce57..4c33ff46c8376ed2355074f7cef6fc225fefa33a 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -53,7 +53,7 @@ function getId(manifest: IExtensionManifest, withVersion?: boolean): string {
 
 const EXTENSION_ID_REGEX = /^([^.]+\..+)@(\d+\.\d+\.\d+(-.*)?)$/;
 
-export function getIdAndVersion(id: string): [string, string] {
+export function getIdAndVersion(id: string): [string, string | undefined] {
 	const matches = EXTENSION_ID_REGEX.exec(id);
 	if (matches && matches[1]) {
 		return [adoptToGalleryExtensionId(matches[1]), matches[2]];
@@ -77,7 +77,7 @@ class Main {
 			await this.setInstallSource(argv['install-source']);
 
 		} else if (argv['list-extensions']) {
-			await this.listExtensions(argv['show-versions']);
+			await this.listExtensions(!!argv['show-versions']);
 
 		} else if (argv['install-extension']) {
 			const arg = argv['install-extension'];
diff --git a/src/vs/platform/telemetry/node/commonProperties.ts b/src/vs/platform/telemetry/node/commonProperties.ts
index 64b965661ad28253a09102f229effe5b3738bf1e..ecf7d4e95590644a7e1674ebe2a68cbdff75d23a 100644
--- a/src/vs/platform/telemetry/node/commonProperties.ts
+++ b/src/vs/platform/telemetry/node/commonProperties.ts
@@ -8,7 +8,7 @@ import * as os from 'os';
 import * as uuid from 'vs/base/common/uuid';
 import { readFile } from 'vs/base/node/pfs';
 
-export function resolveCommonProperties(commit: string | undefined, version: string, machineId: string, installSourcePath: string): Promise<{ [name: string]: string | undefined; }> {
+export function resolveCommonProperties(commit: string | undefined, version: string, machineId: string | undefined, installSourcePath: string): Promise<{ [name: string]: string | undefined; }> {
 	const result: { [name: string]: string | undefined; } = Object.create(null);
 	// __GDPR__COMMON__ "common.machineId" : { "endPoint": "MacAddressHash", "classification": "EndUserPseudonymizedInformation", "purpose": "FeatureInsight" }
 	result['common.machineId'] = machineId;