diff --git a/src/vs/base/common/glob.ts b/src/vs/base/common/glob.ts
index 33da9d6b879ea819913e5b228fd0dd914088adf2..8fcd060bf94b38520104e1d5d8912f28b137b931 100644
--- a/src/vs/base/common/glob.ts
+++ b/src/vs/base/common/glob.ts
@@ -436,7 +436,8 @@ export function parse(arg1: string | IExpression, options: IGlobOptions = {}): a
 export function parseToAsync(expression: IExpression, options?: IGlobOptions): ParsedExpression {
 	const parsedExpression = parse(expression, options);
 	return (path: string, basename?: string, siblingsFn?: () => TPromise<string[]>): TPromise<string> => {
-		return TPromise.as(parsedExpression(path, basename, siblingsFn));
+		const result = parsedExpression(path, basename, siblingsFn);
+		return typeof result === 'string' ? TPromise.as(result) : result;
 	};
 }
 
diff --git a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts b/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts
index 61afed811363ffa6cbc35df94e39c489b6a02cb6..182404712f76ca77af9b2e9b8b977c9cc77b997e 100644
--- a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts
+++ b/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts
@@ -15,7 +15,7 @@ import { CancellationToken } from 'vs/base/common/cancellation';
 import { asWinJsPromise } from 'vs/base/common/async';
 import { Position } from 'vs/editor/common/core/position';
 
-function outputResults(promises: TPromise<Location[]>[]) {
+function outputResults(promises: TPromise<Location | Location[]>[]) {
 	return TPromise.join(promises).then(allReferences => {
 		let result: Location[] = [];
 		for (let references of allReferences) {
diff --git a/src/vs/editor/contrib/rename/browser/rename.ts b/src/vs/editor/contrib/rename/browser/rename.ts
index 582e3a2ab4ea5000b9d5b6ffff294e38fd23b5ab..70fc125ffa5bc94e64feeb9d0e66ba2ea945c486 100644
--- a/src/vs/editor/contrib/rename/browser/rename.ts
+++ b/src/vs/editor/contrib/rename/browser/rename.ts
@@ -38,7 +38,7 @@ export function rename(model: IReadOnlyModel, position: Position, newName: strin
 	let hasResult = false;
 
 	const factory = supports.map(support => {
-		return () => {
+		return (): TPromise<WorkspaceEdit> => {
 			if (!hasResult) {
 				return asWinJsPromise((token) => {
 					return support.provideRenameEdits(model, position, newName, token);
diff --git a/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts
index 896e593b00577576128151aef89590cc6891cb66..0aa87cb728251ee5af7fde182b44c4c702d1ada5 100644
--- a/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts
+++ b/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts
@@ -32,7 +32,7 @@ export function getOccurrencesAtPosition(model: editorCommon.IReadOnlyModel, pos
 	// until someone response with a good result
 	// (good = none empty array)
 	return sequence(orderedByScore.map(provider => {
-		return () => {
+		return (): TPromise<DocumentHighlight[]> => {
 			if (!foundResult) {
 				return asWinJsPromise((token) => {
 					return provider.provideDocumentHighlights(model, position, token);
diff --git a/src/vs/platform/update/electron-main/updateService.ts b/src/vs/platform/update/electron-main/updateService.ts
index aa3f75c6d5140bb8a8fc93b5595cc3ef1f4a28e4..4db56de6d6427c6b405279297bb7161f4208ba67 100644
--- a/src/vs/platform/update/electron-main/updateService.ts
+++ b/src/vs/platform/update/electron-main/updateService.ts
@@ -44,8 +44,8 @@ export class UpdateService implements IUpdateService {
 	private _onUpdateNotAvailable = new Emitter<boolean>();
 	get onUpdateNotAvailable(): Event<boolean> { return this._onUpdateNotAvailable.event; }
 
-	private _onUpdateReady = new Emitter<IUpdate>();
-	get onUpdateReady(): Event<IUpdate> { return this._onUpdateReady.event; }
+	private _onUpdateReady = new Emitter<IRawUpdate>();
+	get onUpdateReady(): Event<IRawUpdate> { return this._onUpdateReady.event; }
 
 	private _onStateChange = new Emitter<State>();
 	get onStateChange(): Event<State> { return this._onStateChange.event; }
@@ -180,7 +180,7 @@ export class UpdateService implements IUpdateService {
 				this.telemetryService.publicLog('update:available', { explicit, version: update.version, currentVersion: product.commit });
 
 			} else {
-				const data: IUpdate = {
+				const data: IRawUpdate = {
 					releaseNotes: update.releaseNotes,
 					version: update.version,
 					date: update.date
diff --git a/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts b/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts
index 6d41b483db6d0b237c75ef32c51b750cec254777..b429be717105f4b1c68b0aadac78b37ed9d8a86c 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts
@@ -40,8 +40,8 @@ type TreeItemHandle = number;
 
 class TreeViewDataProvider implements ITreeViewDataProvider {
 
-	private _onDidChange: Emitter<ITreeItem | undefined | void> = new Emitter<ITreeItem | undefined | void>();
-	readonly onDidChange: Event<ITreeItem | undefined | void> = this._onDidChange.event;
+	private _onDidChange: Emitter<ITreeItem | undefined | null> = new Emitter<ITreeItem | undefined | null>();
+	readonly onDidChange: Event<ITreeItem | undefined | null> = this._onDidChange.event;
 
 	private childrenMap: Map<TreeItemHandle, TreeItemHandle[]> = new Map<TreeItemHandle, TreeItemHandle[]>();
 	private itemsMap: Map<TreeItemHandle, ITreeItem> = new Map<TreeItemHandle, ITreeItem>();
diff --git a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts
index 43fe76a8ce04d6821a12c493bc493e61b5570593..8e4f75e32caf7eb2694033469cb448990a779f6d 100644
--- a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts
+++ b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts
@@ -22,7 +22,7 @@ export interface ISnippetsService {
 
 	registerSnippets(languageId: LanguageId, snippets: ISnippet[], owner: string): void;
 
-	visitSnippets(languageId: LanguageId, accept: (snippet: ISnippet) => void): void;
+	visitSnippets(languageId: LanguageId, accept: (snippet: ISnippet) => boolean): void;
 
 	getSnippets(languageId: LanguageId): ISnippet[];
 }
diff --git a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
index 76a07d3b7a02413b36d614bbc186cc2a188c79d9..a4bfa6e87e1027a0c5a768d4028d8e512402761d 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
@@ -213,7 +213,7 @@ export class TerminalTaskSystem extends EventEmitter implements ITaskSystem {
 		}
 
 		if (task.command) {
-			return TPromise.join(promises).then((summaries): ITaskSummary => {
+			return TPromise.join(promises).then((summaries): TPromise<ITaskSummary> | ITaskSummary => {
 				for (let summary of summaries) {
 					if (summary.exitCode !== 0) {
 						return { exitCode: summary.exitCode };
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
index 5c3a969a73a850a64b66fdd6b4434a2ca8e9e9d1..e731656e46d530dd085bb860698a661ad5dcaf07 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
@@ -178,7 +178,7 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 				}
 				return this._validateShellPaths(label, potentialPaths);
 			}
-			return [label, current];
+			return [label, current] as [string, string];
 		});
 	}