diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 1799f19c380..6097e3337dd 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -6198,7 +6198,7 @@ module ts {
         // True if the given identifier is part of a type reference
         function isTypeReferenceIdentifier(identifier: Identifier): boolean {
             var node: Node = identifier;
-            while (node.parent && node.parent.kind === SyntaxKind.QualifiedName) node = node.parent;
+            if (node.parent && node.parent.kind === SyntaxKind.QualifiedName) node = node.parent;
             return node.parent && node.parent.kind === SyntaxKind.TypeReference;
         }
 
diff --git a/src/services/services.ts b/src/services/services.ts
index c3359b1004c..1c60f2c6ba0 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -108,7 +108,7 @@ module ts {
         }
 
         public getWidth(): number {
-            return this.getStart() - this.getEnd();
+            return this.getEnd() - this.getStart();
         }
 
         public getFullWidth(): number {
@@ -1235,6 +1235,16 @@ module ts {
         };
     }
 
+    // A cache of completion entries for keywords, these do not change between sessions
+    var keywordCompletions:CompletionEntry[] = [];
+    for (var i = SyntaxKind.FirstKeyword; i <= SyntaxKind.LastKeyword; i++) {
+        keywordCompletions.push({
+            name: tokenToString(i),
+            kind: ScriptElementKind.keyword,
+            kindModifiers: ScriptElementKindModifier.none
+        });
+    }
+
     export function createLanguageService(host: LanguageServiceHost, documentRegistry: DocumentRegistry): LanguageService {
         var syntaxTreeCache: SyntaxTreeCache = new SyntaxTreeCache(host);
         var formattingRulesProvider: TypeScript.Services.Formatting.RulesProvider;
@@ -1246,7 +1256,6 @@ module ts {
         var documentRegistry = documentRegistry;
         var cancellationToken = new CancellationTokenObject(host.getCancellationToken());
         var activeCompletionSession: CompletionSession;         // The current active completion session, used to get the completion entry details
-        var keywordCompletions = getKeywordCompletionEntries(); // A cache of completion entries for keywords, these do not change between sessions
 
         // Check if the localized messages json is set, otherwise query the host for it
         if (!TypeScript.LocalizedDiagnosticMessages) {
@@ -1301,7 +1310,8 @@ module ts {
                 // If the language version changed, then that affects what types of things we parse. So
                 // we have to dump all syntax trees.
                 // TODO: handle propagateEnumConstants
-                var settingsChangeAffectsSyntax = oldSettings.target !== compilationSettings.target;
+                // TODO: is module still needed
+                var settingsChangeAffectsSyntax = oldSettings.target !== compilationSettings.target || oldSettings.module !== compilationSettings.module;
 
                 var changesInCompilationSettingsAffectSyntax =
                     oldSettings && compilationSettings && !compareDataObjects(oldSettings, compilationSettings) && settingsChangeAffectsSyntax;
@@ -1423,37 +1433,6 @@ module ts {
             };
         }
 
-        function getKeywordCompletionEntries(): CompletionEntry[] {
-            var keywords = [
-                "break",
-                "case", "catch", "class", "constructor", "continue",
-                "debugger", "declare", "default", "delete", "do",
-                "else", "enum", "export", "extends",
-                "false", "finally", "for", "function",
-                "get",
-                "if","implements", "import", "in", "instanceof", "interface",
-                "module",
-                "new", "null",
-                "private", "public",
-                "require","return",
-                "set", "static", "super", "switch",
-                "this", "throw", "true", "try", "typeof",
-                "var",
-                "while","with",
-            ];
-
-            var result: CompletionEntry[] = [];
-            forEach(keywords, (keyword) => {
-                result.push({
-                    name: keyword,
-                    kind: ScriptElementKind.keyword,
-                    kindModifiers: ScriptElementKindModifier.none
-                });
-            });
-
-            return result;
-        }
-
         function getCompletionsAtPosition(filename: string, position: number, isMemberCompletion: boolean) {
             function getCompletionEntriesFromSymbols(symbols: Symbol[], session: CompletionSession): void {
                 forEach(symbols, (symbol) => {