diff --git a/src/sql/services/capabilities/capabilitiesService.ts b/src/sql/services/capabilities/capabilitiesService.ts
index e9723679ee..8aabf5c8c1 100644
--- a/src/sql/services/capabilities/capabilitiesService.ts
+++ b/src/sql/services/capabilities/capabilitiesService.ts
@@ -14,7 +14,7 @@ import Event, { Emitter } from 'vs/base/common/event';
 import { IAction } from 'vs/base/common/actions';
 import { Deferred } from 'sql/base/common/promise';
 import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IExtensionManagementService, ILocalExtension, IExtensionEnablementService,	LocalExtensionType } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IExtensionManagementService, ILocalExtension, IExtensionEnablementService, LocalExtensionType } from 'vs/platform/extensionManagement/common/extensionManagement';
 
 export const SERVICE_ID = 'capabilitiesService';
 export const HOST_NAME = 'sqlops';
@@ -89,8 +89,8 @@ export class CapabilitiesService implements ICapabilitiesService {
 
 	private _registeredCapabilities: number = 0;
 
-	constructor(@IExtensionManagementService private extensionManagementService: IExtensionManagementService,
-				@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService) {
+	constructor( @IExtensionManagementService private extensionManagementService: IExtensionManagementService,
+		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService) {
 
 		this._onProviderRegistered = new Emitter<data.DataProtocolServerCapabilities>();
 		this.disposables.push(this._onProviderRegistered);
@@ -98,8 +98,8 @@ export class CapabilitiesService implements ICapabilitiesService {
 
 		// Get extensions and filter where the category has 'Data Provider' in it
 		this.extensionManagementService.getInstalled(LocalExtensionType.User).then((extensions: ILocalExtension[]) => {
-			let dataProviderExtensions = extensions.filter(extension  =>
-				extension.manifest.categories.indexOf(CapabilitiesService.DATA_PROVIDER_CATEGORY) > -1);
+			let dataProviderExtensions = extensions.filter(extension =>
+				extension.manifest.categories && extension.manifest.categories.indexOf(CapabilitiesService.DATA_PROVIDER_CATEGORY) > -1);
 
 			if (dataProviderExtensions.length > 0) {
 				// Scrape out disabled extensions
diff --git a/src/sql/workbench/api/electron-browser/mainThreadModalDialog.ts b/src/sql/workbench/api/electron-browser/mainThreadModalDialog.ts
index 6aa5a0a99e..32673afe94 100644
--- a/src/sql/workbench/api/electron-browser/mainThreadModalDialog.ts
+++ b/src/sql/workbench/api/electron-browser/mainThreadModalDialog.ts
@@ -5,7 +5,7 @@
 'use strict';
 import { WebViewDialog } from 'sql/base/browser/ui/modal/webViewDialog';
 
-import { MainThreadModalDialogShape, SqlMainContext, SqlExtHostContext, ExtHostModalDialogsShape } from 'sql/workbench/api/node/sqlextHost.protocol';
+import { MainThreadModalDialogShape, SqlMainContext, SqlExtHostContext, ExtHostModalDialogsShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
 import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
diff --git a/src/sql/workbench/api/node/extHostModalDialog.ts b/src/sql/workbench/api/node/extHostModalDialog.ts
index aac7c5f013..9fc85b81fa 100644
--- a/src/sql/workbench/api/node/extHostModalDialog.ts
+++ b/src/sql/workbench/api/node/extHostModalDialog.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { SqlMainContext, MainThreadModalDialogShape, ExtHostModalDialogsShape } from 'sql/workbench/api/node/sqlextHost.protocol';
+import { SqlMainContext, MainThreadModalDialogShape, ExtHostModalDialogsShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
 import { IMainContext } from 'vs/workbench/api/node/extHost.protocol';
 import * as vscode from 'vscode';
 import * as data from 'data';