diff --git a/src/vs/base/node/proxy.ts b/src/vs/base/node/proxy.ts
index 5629b9032e7..d3d525ce0d0 100644
--- a/src/vs/base/node/proxy.ts
+++ b/src/vs/base/node/proxy.ts
@@ -8,8 +8,6 @@
 import { Url, parse as parseUrl } from 'url';
 import { isBoolean } from 'vs/base/common/types';
 import { Agent } from './request';
-import { TPromise } from 'vs/base/common/winjs.base';
-
 
 function getSystemProxyURI(requestURL: Url): string {
 	if (requestURL.protocol === 'http:') {
@@ -26,7 +24,7 @@ export interface IOptions {
 	strictSSL?: boolean;
 }
 
-export async function getProxyAgent(rawRequestURL: string, options: IOptions = {}): TPromise<Agent> {
+export async function getProxyAgent(rawRequestURL: string, options: IOptions = {}): Promise<Agent> {
 	const requestURL = parseUrl(rawRequestURL);
 	const proxyURL = options.proxyUrl || getSystemProxyURI(requestURL);
 
diff --git a/src/vs/base/node/request.ts b/src/vs/base/node/request.ts
index 79a067db70e..35506f37331 100644
--- a/src/vs/base/node/request.ts
+++ b/src/vs/base/node/request.ts
@@ -49,7 +49,7 @@ export interface IRequestFunction {
 	(options: IRequestOptions): TPromise<IRequestContext>;
 }
 
-async function getNodeRequest(options: IRequestOptions): TPromise<IRawRequestFunction> {
+async function getNodeRequest(options: IRequestOptions): Promise<IRawRequestFunction> {
 	const endpoint = parseUrl(options.url);
 	const module = endpoint.protocol === 'https:' ? await import('https') : await import('http');
 	return module.request;
@@ -60,7 +60,7 @@ export function request(options: IRequestOptions): TPromise<IRequestContext> {
 
 	const rawRequestPromise = options.getRawRequest
 		? TPromise.as(options.getRawRequest(options))
-		: getNodeRequest(options);
+		: TPromise.wrap(getNodeRequest(options));
 
 	return rawRequestPromise.then(rawRequest => {
 
diff --git a/src/vs/editor/contrib/codeAction/codeActionCommands.ts b/src/vs/editor/contrib/codeAction/codeActionCommands.ts
index 9ea29d8e5e4..8af707d45ba 100644
--- a/src/vs/editor/contrib/codeAction/codeActionCommands.ts
+++ b/src/vs/editor/contrib/codeAction/codeActionCommands.ts
@@ -139,8 +139,8 @@ export class QuickFixController implements IEditorContribution {
 		this._lightBulbWidget.title = title;
 	}
 
-	private async _onApplyCodeAction(action: CodeAction): TPromise<void> {
-		await applyCodeAction(action, this._bulkEditService, this._commandService, this._editor);
+	private _onApplyCodeAction(action: CodeAction): TPromise<void> {
+		return TPromise.wrap(applyCodeAction(action, this._bulkEditService, this._commandService, this._editor));
 	}
 }
 
@@ -149,7 +149,7 @@ export async function applyCodeAction(
 	bulkEditService: IBulkEditService,
 	commandService: ICommandService,
 	editor?: ICodeEditor,
-) {
+): Promise<void> {
 	if (action.edit) {
 		await bulkEditService.apply(action.edit, { editor });
 	}