diff --git a/src/sql/workbench/update/releaseNotes.ts b/src/sql/workbench/update/releaseNotes.ts
index 5b9ac97e14..078945e638 100644
--- a/src/sql/workbench/update/releaseNotes.ts
+++ b/src/sql/workbench/update/releaseNotes.ts
@@ -20,7 +20,7 @@ export class OpenGettingStartedInBrowserAction extends Action {
 	constructor(
 		@IOpenerService private openerService: IOpenerService
 	) {
-		super('update.openGettingStartedGuide', nls.localize('gettingStarted', "Get Started"), null, true);
+		super('update.openGettingStartedGuide', nls.localize('gettingStarted', "Get Started"), undefined, true);
 	}
 
 	run(): Promise<any> {
diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json
index 58498f5f89..7e0f0fa968 100644
--- a/src/tsconfig.strictNullChecks.json
+++ b/src/tsconfig.strictNullChecks.json
@@ -7,7 +7,10 @@
 	},
 	"include": [
 		"./typings",
-		"./vs/**.*.ts",
+		"./vs/vscode.d.ts",
+		"./vs/vscode.proposed.d.ts",
+		"./sql/azdata.d.ts",
+		"./sql/azdata.proposed.d.ts",
 		"./sql/base/browser/ui/breadcrumb/*.ts",
 		"./sql/base/browser/ui/button/*.ts",
 		"./sql/base/browser/ui/checkbox/*.ts",
diff --git a/src/vs/workbench/api/browser/mainThreadSearch.ts b/src/vs/workbench/api/browser/mainThreadSearch.ts
index 83c3c4bf3c..5f0749a921 100644
--- a/src/vs/workbench/api/browser/mainThreadSearch.ts
+++ b/src/vs/workbench/api/browser/mainThreadSearch.ts
@@ -117,7 +117,7 @@ class RemoteSearchProvider implements ISearchResultProvider, IDisposable {
 		return this.doSearch(query, undefined, token);
 	}
 
-	textSearch(query: ITextQuery, onProgress?: (p: ISearchProgressItem) => void, token: CancellationToken = CancellationToken.None): Promise<ISearchComplete | undefined> {
+	textSearch(query: ITextQuery, onProgress?: (p: ISearchProgressItem) => void, token: CancellationToken = CancellationToken.None): Promise<ISearchComplete> {
 		return this.doSearch(query, onProgress, token);
 	}
 
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
index 2309537731..ee97ec5168 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -106,18 +106,6 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 		this.onDidRegisterViewlets(viewletService.getViewlets());
 	}
 
-	// {{SQL CARBON EDIT}}
-	private getViewlets(): ViewletDescriptor[] {
-		const pinnedViewlets = JSON.parse(this.storageService.get(ActivitybarPart.PINNED_VIEWLETS, StorageScope.GLOBAL, null)) as string[];
-		const allViewLets = this.viewletService.getViewlets();
-
-		if (!pinnedViewlets) {
-			return allViewLets.filter(viewlet => viewlet.id !== 'workbench.view.extensions') ;
-		}
-
-		return allViewLets;
-	}
-
 	private registerListeners(): void {
 
 		// Viewlet registration
@@ -523,4 +511,4 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 	}
 }
 
-registerSingleton(IActivityBarService, ActivitybarPart);
\ No newline at end of file
+registerSingleton(IActivityBarService, ActivitybarPart);
diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
index a9c6fd05a0..aa4f9e3df6 100644
--- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts
+++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
@@ -123,7 +123,7 @@ class UntitledEditorInputFactory implements IEditorInputFactory {
 
 		// {{SQL CARBON EDIT}}
 		if (!untitledEditorInput.getResource()) {
-			return null;
+			return undefined;
 		}
 
 		let resource = untitledEditorInput.getResource();
@@ -927,4 +927,4 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
 	title: nls.localize({ key: 'miSwitchGroup', comment: ['&& denotes a mnemonic'] }, "Switch &&Group"),
 	submenu: MenuId.MenubarSwitchGroupMenu,
 	order: 2
-});
\ No newline at end of file
+});
diff --git a/src/vs/workbench/contrib/preferences/electron-browser/preferences.contribution.ts b/src/vs/workbench/contrib/preferences/electron-browser/preferences.contribution.ts
index 58eda76087..9e5d40b36f 100644
--- a/src/vs/workbench/contrib/preferences/electron-browser/preferences.contribution.ts
+++ b/src/vs/workbench/contrib/preferences/electron-browser/preferences.contribution.ts
@@ -256,8 +256,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_E),
 	handler: (accessor, args: any) => {
 		const control = accessor.get(IEditorService).activeControl as IKeybindingsEditor;
-		if (control && control instanceof KeybindingsEditor && control.activeKeybindingEntry.keybindingItem.keybinding) {
-			control.defineWhenExpression(control.activeKeybindingEntry);
+		if (control && control instanceof KeybindingsEditor && control.activeKeybindingEntry!.keybindingItem.keybinding) {
+			control.defineWhenExpression(control.activeKeybindingEntry!);
 		}
 	}
 });
diff --git a/src/vs/workbench/contrib/search/browser/searchActions.ts b/src/vs/workbench/contrib/search/browser/searchActions.ts
index 48a8df8e72..14a99235e3 100644
--- a/src/vs/workbench/contrib/search/browser/searchActions.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActions.ts
@@ -71,7 +71,7 @@ export function getSearchView(viewletService: IViewletService, panelService: IPa
 		return (activePanel as SearchPanel).getSearchView();
 	}
 
-	return null;
+	return undefined;
 }
 
 function doAppendKeyBindingLabel(label: string, keyBinding: ResolvedKeybinding | undefined): string {
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
index 855fb011e8..780263fc42 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
@@ -111,11 +111,6 @@ export class ExtensionHostProcessWorker implements IExtensionHostStarter {
 		}));
 	}
 
-	// {{SQL CARBON EDIT}}
-	public getExtenstionHostProcess(): ChildProcess {
-		return this._extensionHostProcess;
-	}
-
 	public dispose(): void {
 		this.terminate();
 	}
diff --git a/src/vs/workbench/services/search/common/search.ts b/src/vs/workbench/services/search/common/search.ts
index 341bc9c47d..258803980a 100644
--- a/src/vs/workbench/services/search/common/search.ts
+++ b/src/vs/workbench/services/search/common/search.ts
@@ -48,8 +48,8 @@ export const enum SearchProviderType {
 }
 
 export interface ISearchResultProvider {
-	textSearch(query: ITextQuery, onProgress?: (p: ISearchProgressItem) => void, token?: CancellationToken): Promise<ISearchComplete | undefined>;
-	fileSearch(query: IFileQuery, token?: CancellationToken): Promise<ISearchComplete | undefined>;
+	textSearch(query: ITextQuery, onProgress?: (p: ISearchProgressItem) => void, token?: CancellationToken): Promise<ISearchComplete>;
+	fileSearch(query: IFileQuery, token?: CancellationToken): Promise<ISearchComplete>;
 	clearCache(cacheKey: string): Promise<void>;
 }