diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 543a63052299d28c73bdf36e29e02010123cc25a..789da519ee27f7119465d0ff6cf6a89d634a6a3e 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -59,7 +59,7 @@ import { touch } from 'vs/base/node/pfs';
 
 export class CodeApplication {
 
-	private static APP_ICON_REFRESH_KEY = 'macOSAppIconRefresh';
+	private static APP_ICON_REFRESH_KEY = 'macOSAppIconRefresh2';
 
 	private toDispose: IDisposable[];
 	private windowsMainService: IWindowsMainService;
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
index f9e3206fb68140e341556d1122d51ea53d9ab404..56dd2f81b7829c96739e5fd02231f31f39cf8e21 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -246,7 +246,7 @@ export class DebugService implements debug.IDebugService {
 
 	private tryToAutoFocusStackFrame(thread: debug.IThread): TPromise<any> {
 		const callStack = thread.getCallStack();
-		if (!callStack.length || (this.viewModel.focusedStackFrame && this.viewModel.focusedStackFrame.thread.threadId === thread.threadId)) {
+		if (!callStack.length || (this.viewModel.focusedStackFrame && this.viewModel.focusedStackFrame.thread.getId() === thread.getId())) {
 			return TPromise.as(null);
 		}
 
diff --git a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
index aaff7820eb6b4b5c291f0833ebf908f9065f4170..cfcfe0e391322d57281887ed9dfef335760c3a20 100644
--- a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
+++ b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
@@ -198,8 +198,8 @@ export class RemoteFileService extends FileService {
 					result[idx] = { stat: undefined, success: false };
 				});
 			});
-			return TPromise.join(promises).then(() => result, () => result);
-		}, err => ([{ stat: undefined, success: false }]));
+			return TPromise.join(promises).then(() => result);
+		});
 	}
 
 	// --- resolve