diff --git a/build/lib/compilation.js b/build/lib/compilation.js
index 2171ffa1ae9..54e640c2b15 100644
--- a/build/lib/compilation.js
+++ b/build/lib/compilation.js
@@ -23,8 +23,6 @@ options.verbose = false;
 options.sourceMap = true;
 options.rootDir = rootDir;
 options.sourceRoot = util.toFileUri(rootDir);
-var smSourceRootPath = path.resolve(path.dirname(rootDir));
-var smSourceRoot = util.toFileUri(smSourceRootPath);
 function createCompile(build, emitError) {
     var opts = _.clone(options);
     opts.inlineSources = !!build;
@@ -48,7 +46,7 @@ function createCompile(build, emitError) {
             .pipe(sourcemaps.write('.', {
             addComment: false,
             includeContent: !!build,
-            sourceRoot: smSourceRoot
+            sourceRoot: options.sourceRoot
         }))
             .pipe(tsFilter.restore)
             .pipe(reporter.end(emitError));
diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts
index ac367a573b0..3b33a6bd7ed 100644
--- a/build/lib/compilation.ts
+++ b/build/lib/compilation.ts
@@ -28,9 +28,6 @@ options.sourceMap = true;
 options.rootDir = rootDir;
 options.sourceRoot = util.toFileUri(rootDir);
 
-const smSourceRootPath = path.resolve(path.dirname(rootDir));
-const smSourceRoot = util.toFileUri(smSourceRootPath);
-
 function createCompile(build: boolean, emitError?: boolean): (token?: util.ICancellationToken) => NodeJS.ReadWriteStream {
 	const opts = _.clone(options);
 	opts.inlineSources = !!build;
@@ -57,7 +54,7 @@ function createCompile(build: boolean, emitError?: boolean): (token?: util.ICanc
 			.pipe(sourcemaps.write('.', {
 				addComment: false,
 				includeContent: !!build,
-				sourceRoot: smSourceRoot
+				sourceRoot: options.sourceRoot
 			}))
 			.pipe(tsFilter.restore)
 			.pipe(reporter.end(emitError));
diff --git a/extensions/typescript/src/features/referencesCodeLensProvider.ts b/extensions/typescript/src/features/referencesCodeLensProvider.ts
index e5795f7b20a..fa4197bbb64 100644
--- a/extensions/typescript/src/features/referencesCodeLensProvider.ts
+++ b/extensions/typescript/src/features/referencesCodeLensProvider.ts
@@ -74,7 +74,7 @@ export default class TypeScriptReferencesCodeLensProvider implements CodeLensPro
 				const locations = response.body.refs
 					.filter(reference =>
 						!(reference.start.line === codeLens.range.start.line + 1
-						&& reference.start.offset === codeLens.range.start.character + 1))
+							&& reference.start.offset === codeLens.range.start.character + 1))
 					.map(reference =>
 						new Location(Uri.file(reference.file),
 							new Range(
diff --git a/package.json b/package.json
index 918583b8c91..2b6100990af 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "gulp-rename": "^1.2.0",
     "gulp-replace": "^0.5.4",
     "gulp-shell": "^0.5.2",
-    "gulp-sourcemaps": "^1.6.0",
+    "gulp-sourcemaps": "^1.11.0",
     "gulp-tsb": "^2.0.3",
     "gulp-tslint": "^7.0.1",
     "gulp-uglify": "^2.0.0",
diff --git a/src/vs/workbench/parts/output/browser/outputServices.ts b/src/vs/workbench/parts/output/browser/outputServices.ts
index 037801d59df..67b45331611 100644
--- a/src/vs/workbench/parts/output/browser/outputServices.ts
+++ b/src/vs/workbench/parts/output/browser/outputServices.ts
@@ -94,7 +94,7 @@ export class OutputService implements IOutputService {
 	}
 
 	private append(channelId: string, output: string): void {
-		
+
 		// Initialize
 		if (!this.receivedOutput[channelId]) {
 			this.receivedOutput[channelId] = '';