diff --git a/packages/doctor/src/android-tools-info.ts b/packages/doctor/src/android-tools-info.ts
index 2c89563abb..1c7c124a05 100644
--- a/packages/doctor/src/android-tools-info.ts
+++ b/packages/doctor/src/android-tools-info.ts
@@ -52,6 +52,8 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
 	}
 	private pathToEmulatorExecutable: string;
 
+	private _cachedRuntimeVersion: string;
+
 	constructor(
 		private childProcess: ChildProcess,
 		private fs: FileSystem,
@@ -508,7 +510,7 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
 	}
 
 	private getSystemRequirementsLink(): string {
-		return Constants.SYSTEM_REQUIREMENTS_LINKS[process.platform] || "";
+		return Constants.SYSTEM_REQUIREMENTS_LINKS;
 	}
 
 	private isAndroidHomeValid(): boolean {
@@ -598,6 +600,10 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
 		runtimeVersion?: string;
 		projectDir?: string;
 	}): string {
+		if (this._cachedRuntimeVersion) {
+			return this._cachedRuntimeVersion;
+		}
+
 		let runtimePackage = {
 			name: Constants.ANDROID_SCOPED_RUNTIME,
 			version: runtimeVersion,
@@ -630,6 +636,7 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
 			);
 		}
 
+		this._cachedRuntimeVersion = runtimeVersion;
 		return runtimeVersion;
 	}
 
diff --git a/packages/doctor/src/constants.ts b/packages/doctor/src/constants.ts
index 090d2dfcb9..3984f7c668 100644
--- a/packages/doctor/src/constants.ts
+++ b/packages/doctor/src/constants.ts
@@ -5,14 +5,8 @@ export class Constants {
 		Constants.ANDROID_PLATFORM_NAME,
 		Constants.IOS_PLATFORM_NAME,
 	];
-	public static SYSTEM_REQUIREMENTS_LINKS: IDictionary<string> = {
-		win32:
-			"http://docs.nativescript.org/setup/ns-cli-setup/ns-setup-win.html#system-requirements",
-		linux:
-			"http://docs.nativescript.org/setup/ns-cli-setup/ns-setup-linux.html#system-requirements",
-		darwin:
-			"http://docs.nativescript.org/setup/ns-cli-setup/ns-setup-os-x.html#system-requirements",
-	};
+	public static SYSTEM_REQUIREMENTS_LINKS =
+		"https://docs.nativescript.org/environment-setup.html";
 	public static INFO_TYPE_NAME = "info";
 	public static WARNING_TYPE_NAME = "warning";
 
diff --git a/packages/doctor/test/android-tools-info.ts b/packages/doctor/test/android-tools-info.ts
index 13dbcc8cea..1e2694166a 100644
--- a/packages/doctor/test/android-tools-info.ts
+++ b/packages/doctor/test/android-tools-info.ts
@@ -22,7 +22,7 @@ describe("androidToolsInfo", () => {
 		"To be able to build for Android, verify that you have installed The Java Development Kit (JDK) and configured it according to system requirements as" +
 		EOL +
 		" described in " +
-		Constants.SYSTEM_REQUIREMENTS_LINKS[process.platform];
+		Constants.SYSTEM_REQUIREMENTS_LINKS;
 	before(() => {
 		process.env["ANDROID_HOME"] = "test";
 	});
diff --git a/packages/doctor/tsconfig.json b/packages/doctor/tsconfig.json
index 0d6fdaee82..e744b95d06 100644
--- a/packages/doctor/tsconfig.json
+++ b/packages/doctor/tsconfig.json
@@ -1,13 +1,7 @@
 {
-	"compilerOptions": {
-		"target": "es6",
-		"module": "commonjs",
-		"sourceMap": true,
-		"declaration": false,
-		"removeComments": false,
-		"noImplicitAny": true,
-		"experimentalDecorators": true,
-		"skipLibCheck": true
-	},
-	"exclude": ["node_modules", "coverage"]
+	"extends": "../../tsconfig.json",
+	"include": [
+		"src/",
+		"test/"
+	]
 }
diff --git a/tsconfig.json b/tsconfig.json
index 3253e8f14e..897919ab82 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -10,11 +10,5 @@
 		"alwaysStrict": true,
 		"noUnusedLocals": true
 	},
-	"exclude": [
-		"node_modules",
-		"lib/common/node_modules",
-		"scratch",
-		"coverage",
-		"resources/test"
-	]
+	"include": ["lib/", "test/"]
 }