diff --git a/.vscode/settings.json b/.vscode/settings.json
index 4f481751900..c9667538bb0 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -9,5 +9,7 @@
         "rulePaths": ["../scripts/eslint/built/rules/"],
         "ext": [".ts"]
     },
-    "eslint.workingDirectories": ["./src", "./scripts"]
+    "eslint.workingDirectories": ["./src", "./scripts"],
+    "typescript.tsserver.log": "normal",
+    "typescript.tsdk": "built/local"
 }
\ No newline at end of file
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index e7668ff140e..e423e3889e4 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -332,7 +332,7 @@ namespace ts {
     /**
      * Like `forEach`, but iterates in reverse order.
      */
-    export function forEachRight<T, U>(array: ReadonlyArray<T> | undefined, callback: (element: T, index: number) => U | undefined): U | undefined {
+    export function forEachRight<T, U>(array: readonly T[] | undefined, callback: (element: T, index: number) => U | undefined): U | undefined {
         if (array) {
             for (let i = array.length - 1; i >= 0; i--) {
                 const result = callback(array[i], i);
diff --git a/src/services/types.ts b/src/services/types.ts
index 22571b3711f..75e8b2680ef 100644
--- a/src/services/types.ts
+++ b/src/services/types.ts
@@ -18,12 +18,10 @@ namespace ts {
         getText(sourceFile?: SourceFile): string;
         getFirstToken(sourceFile?: SourceFile): Node | undefined;
         /* @internal */
-        // tslint:disable-next-line unified-signatures
-        getFirstToken(sourceFile?: SourceFileLike): Node | undefined;
+        getFirstToken(sourceFile?: SourceFileLike): Node | undefined; // eslint-disable-line @typescript-eslint/unified-signatures
         getLastToken(sourceFile?: SourceFile): Node | undefined;
         /* @internal */
-        // tslint:disable-next-line unified-signatures
-        getLastToken(sourceFile?: SourceFileLike): Node | undefined;
+        getLastToken(sourceFile?: SourceFileLike): Node | undefined; // eslint-disable-line @typescript-eslint/unified-signatures
         // See ts.forEachChild for documentation.
         forEachChild<T>(cbNode: (node: Node) => T | undefined, cbNodeArray?: (nodes: NodeArray<Node>) => T | undefined): T | undefined;
     }