diff --git a/src/sql/workbench/browser/modelComponents/componentBase.ts b/src/sql/workbench/browser/modelComponents/componentBase.ts
index 890386562d..6003c3680a 100644
--- a/src/sql/workbench/browser/modelComponents/componentBase.ts
+++ b/src/sql/workbench/browser/modelComponents/componentBase.ts
@@ -17,7 +17,7 @@ import { ModelComponentWrapper } from 'sql/workbench/browser/modelComponents/mod
 import { URI } from 'vs/base/common/uri';
 import * as nls from 'vs/nls';
 import { EventType, addDisposableListener } from 'vs/base/browser/dom';
-import { IKeyboardEvent, StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { endsWith } from 'vs/base/common/strings';
 import { firstIndex } from 'vs/base/common/arrays';
 import { IComponentDescriptor, IComponent, IModelStore, IComponentEventArgs, ComponentEventType } from 'sql/platform/dashboard/browser/interfaces';
@@ -291,7 +291,7 @@ export abstract class ComponentBase extends Disposable implements IComponent, On
 		(<HTMLElement>this._el.nativeElement).focus();
 	}
 
-	protected onkeydown(domNode: HTMLElement, listener: (e: IKeyboardEvent) => void): void {
+	protected onkeydown(domNode: HTMLElement, listener: (e: StandardKeyboardEvent) => void): void {
 		this._register(addDisposableListener(domNode, EventType.KEY_DOWN, (e: KeyboardEvent) => listener(new StandardKeyboardEvent(e))));
 	}
 }
diff --git a/src/sql/workbench/browser/modelComponents/table.component.ts b/src/sql/workbench/browser/modelComponents/table.component.ts
index fce3211b09..40d4f2bda1 100644
--- a/src/sql/workbench/browser/modelComponents/table.component.ts
+++ b/src/sql/workbench/browser/modelComponents/table.component.ts
@@ -147,9 +147,9 @@ export default class TableComponent extends ComponentBase implements IComponent,
 				});
 			}));
 
-			this._table.grid.onKeyDown.subscribe((e: KeyboardEvent) => {
+			this._table.grid.onKeyDown.subscribe((e: DOMEvent) => {
 				if (this.moveFocusOutWithTab) {
-					let event = new StandardKeyboardEvent(e);
+					let event = new StandardKeyboardEvent(e as KeyboardEvent);
 					if (event.equals(KeyMod.Shift | KeyCode.Tab)) {
 						e.stopImmediatePropagation();
 						(<HTMLElement>(<HTMLElement>this._inputContainer.nativeElement).previousElementSibling).focus();
diff --git a/src/tsconfig.vscode.json b/src/tsconfig.vscode.json
index e51a6c7457..c6ca3cdb7b 100644
--- a/src/tsconfig.vscode.json
+++ b/src/tsconfig.vscode.json
@@ -59,6 +59,7 @@
 		"./vs/workbench/services/credentials/**/*.ts", // 3087
 		"./vs/workbench/services/dialogs/**/*.ts", // 3087
 		"./vs/workbench/services/editor/**/*.ts", // 3087
+		"./vs/workbench/services/electron/**/*.ts", // 3087
 		"./vs/workbench/services/environment/**/*.ts", // 3087
 		"./vs/workbench/services/extensionManagement/**/*.ts", // 3087
 		"./vs/workbench/services/extensions/**/*.ts", // 3287
@@ -67,12 +68,14 @@
 		"./vs/workbench/services/host/**/*.ts", // 3087
 		"./vs/workbench/services/keybinding/**/*.ts",  // 3087
 		"./vs/workbench/services/label/**/*.ts",  // 3087
+		"./vs/workbench/services/lifecycle/**/*.ts", // 3087
 		"./vs/workbench/services/output/**/*.ts", // 3087
 		"./vs/workbench/services/path/**/*.ts", // 3087
 		"./vs/workbench/services/preferences/**/*.ts", // 3087
 		"./vs/workbench/services/progress/**/*.ts", // 3087
 		"./vs/workbench/services/remote/**/*.ts", // 3087
 		"./vs/workbench/services/search/**/*.ts", // 3087
+		"./vs/workbench/services/sharedProcess/**/*.ts", // 3087
 		"./vs/workbench/services/telemetry/**/*.ts", // 3087
 		"./vs/workbench/services/textfile/**/*.ts", // 3087
 		"./vs/workbench/services/textmodelResolver/**/*.ts", // 3087