diff --git a/src/services/compiler/bloomFilter.ts b/src/services/compiler/bloomFilter.ts
index fe841b6f7a..8b0e3674e0 100644
--- a/src/services/compiler/bloomFilter.ts
+++ b/src/services/compiler/bloomFilter.ts
@@ -81,7 +81,7 @@ module TypeScript {
             return Hash.computeMurmur2StringHashCode(key, seed);
         }
 
-        public addKeys(keys: IIndexable<any>) {
+        public addKeys(keys: ts.Map<any>) {
             for (var name in keys) {
                 if (keys[name]) {
                     this.add(name);
diff --git a/src/services/compiler/hashTable.ts b/src/services/compiler/hashTable.ts
index 0e05a05b52..89c7551a57 100644
--- a/src/services/compiler/hashTable.ts
+++ b/src/services/compiler/hashTable.ts
@@ -39,7 +39,7 @@ module TypeScript {
         }
     }
 
-    export function createIntrinsicsObject<T>(): IIndexable<T> {
+    export function createIntrinsicsObject<T>(): ts.Map<T> {
         return new BlockIntrinsics<T>();
     }
 
diff --git a/src/services/compiler/referenceResolution.ts b/src/services/compiler/referenceResolution.ts
index 315c72d98f..528347a6ea 100644
--- a/src/services/compiler/referenceResolution.ts
+++ b/src/services/compiler/referenceResolution.ts
@@ -16,6 +16,10 @@
 ///<reference path='references.ts' />
 
 module TypeScript {
+    export interface ILineAndCharacter {
+        line: number;
+        character: number;
+    }
 
     // Note: This is being using by the host (VS) and is marshaled back and forth. When changing this make sure the changes 
     // are reflected in the managed side as well.
diff --git a/src/services/compiler/referenceResolver.ts b/src/services/compiler/referenceResolver.ts
index d1b264d081..7991be64a8 100644
--- a/src/services/compiler/referenceResolver.ts
+++ b/src/services/compiler/referenceResolver.ts
@@ -44,7 +44,7 @@ module TypeScript {
     export class ReferenceResolver {
         private inputFileNames: string[];
         private host: IReferenceResolverHost;
-        private visited: IIndexable<string>;
+        private visited: ts.Map<string>;
 
         constructor(inputFileNames: string[], host: IReferenceResolverHost, private useCaseSensitiveFileResolution: boolean) {
             this.inputFileNames = inputFileNames;
diff --git a/src/services/core/diagnosticCore.ts b/src/services/core/diagnosticCore.ts
index 0a796a6770..8485052af8 100644
--- a/src/services/core/diagnosticCore.ts
+++ b/src/services/core/diagnosticCore.ts
@@ -1,7 +1,7 @@
 ///<reference path='references.ts' />
 
 module TypeScript {
-    export var LocalizedDiagnosticMessages: IIndexable<any> = null;
+    export var LocalizedDiagnosticMessages: ts.Map<any> = null;
 
     export class Location {
         private _fileName: string;
@@ -120,7 +120,7 @@ module TypeScript {
         // TODO: We need to expose an extensibility point on our hosts to have them tell us what 
         // they want the newline string to be.  That way we can get the correct result regardless
         // of which host we use
-        return Environment ? Environment.newLine : "\r\n";
+        return sys.newLine ? sys.newLine : "\r\n";
     }
 
     function getLargestIndex(diagnostic: string): number {
diff --git a/src/services/formatting/rules.ts b/src/services/formatting/rules.ts
index 2a297efc37..ade1dc6b21 100644
--- a/src/services/formatting/rules.ts
+++ b/src/services/formatting/rules.ts
@@ -18,7 +18,7 @@
 module TypeScript.Services.Formatting {
     export class Rules {
         public getRuleName(rule: Rule) {
-            var o: IIndexable<any> = <any>this;
+            var o: ts.Map<any> = <any>this;
             for (var name in o) {
                 if (o[name] === rule) {
                     return name;
diff --git a/src/services/getScriptLexicalStructureWalker.ts b/src/services/getScriptLexicalStructureWalker.ts
index 66d930784d..a9a179e51b 100644
--- a/src/services/getScriptLexicalStructureWalker.ts
+++ b/src/services/getScriptLexicalStructureWalker.ts
@@ -2,9 +2,9 @@
 ///<reference path='references.ts' />
 module TypeScript.Services {
     interface LexicalScope {
-        items: TypeScript.IIndexable<NavigateToItem>;
+        items: ts.Map<NavigateToItem>;
         itemNames: string[];
-        childScopes: TypeScript.IIndexable<LexicalScope>;
+        childScopes: ts.Map<LexicalScope>;
         childScopeNames: string[];
     }
 
diff --git a/src/services/resources/diagnosticInformationMap.generated.ts b/src/services/resources/diagnosticInformationMap.generated.ts
index ed594be698..8d3bc73486 100644
--- a/src/services/resources/diagnosticInformationMap.generated.ts
+++ b/src/services/resources/diagnosticInformationMap.generated.ts
@@ -1,7 +1,7 @@
 // <auto-generated />
 /// <reference path="..\core\diagnosticCategory.ts" />
 module TypeScript {
-  export var diagnosticInformationMap: IIndexable<any> = {
+    export var diagnosticInformationMap: ts.Map<any> = {
     "error TS{0}: {1}": { "code": 0, "category": DiagnosticCategory.NoPrefix },
     "warning TS{0}: {1}": { "code": 1, "category": DiagnosticCategory.NoPrefix },
     "Unrecognized escape sequence.": { "code": 1000, "category": DiagnosticCategory.Error },