diff --git a/dist/MeteorObservable.d.ts b/dist/MeteorObservable.d.ts
index d9ee1d2d..474a7e4b 100644
--- a/dist/MeteorObservable.d.ts
+++ b/dist/MeteorObservable.d.ts
@@ -1,3 +1,4 @@
+/// <reference types="meteor-typings" />
 import { Observable } from 'rxjs';
 /**
  * A class with static methods, which wraps Meteor's API and returns
diff --git a/dist/ObservableCollection.d.ts b/dist/ObservableCollection.d.ts
index 78697a72..59415e98 100644
--- a/dist/ObservableCollection.d.ts
+++ b/dist/ObservableCollection.d.ts
@@ -1,3 +1,4 @@
+/// <reference types="meteor-typings" />
 import { Observable } from 'rxjs';
 import { ObservableCursor } from './ObservableCursor';
 import Selector = Mongo.Selector;
diff --git a/dist/ObservableCursor.d.ts b/dist/ObservableCursor.d.ts
index d9f6c076..14155de4 100644
--- a/dist/ObservableCursor.d.ts
+++ b/dist/ObservableCursor.d.ts
@@ -1,3 +1,4 @@
+/// <reference types="meteor-typings" />
 import { Observable } from 'rxjs';
 export declare class ObservableCursor<T> extends Observable<T[]> {
     private _zone;
diff --git a/dist/utils.js b/dist/utils.js
index babecb06..88433cea 100644
--- a/dist/utils.js
+++ b/dist/utils.js
@@ -12,7 +12,7 @@ export function isCallbacksObject(callbacks) {
 ;
 export var g = typeof global === 'object' ? global :
     typeof window === 'object' ? window :
-        typeof self === 'object' ? self : this;
+        typeof self === 'object' ? self : undefined;
 var METEOR_RXJS_ZONE = 'meteor-rxjs-zone';
 var fakeZone = {
     name: METEOR_RXJS_ZONE,
diff --git a/dist/zone.d.ts b/dist/zone.d.ts
index 731de149..158232b2 100644
--- a/dist/zone.d.ts
+++ b/dist/zone.d.ts
@@ -1,3 +1,4 @@
+/// <reference types="zone.js" />
 import { Observable } from 'rxjs';
 export declare function zone<T>(zone?: Zone): Observable<T>;
 export interface ZoneSignature<T> {
diff --git a/package.json b/package.json
index f06e3e2d..1d44cb05 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
     "rxjs": "^5.0.0-beta.12"
   },
   "devDependencies": {
+    "meteor-typings": "1.3.1",
     "@types/mocha": "2.2.32",
     "@types/underscore": "1.7.33",
     "conventional-changelog": "1.1.0",
@@ -51,8 +52,6 @@
     "rollup": "0.36.3",
     "rxjs": "^5.0.0-beta.12",
     "tslint": "3.15.1",
-    "typescript": "2.0.6",
-    "typings": "1.5.0",
     "validate-commit-msg": "2.8.2",
     "zone.js": "^0.6.22"
   }
diff --git a/src/ObservableCursor.ts b/src/ObservableCursor.ts
index 60ba9f0e..627cf42a 100644
--- a/src/ObservableCursor.ts
+++ b/src/ObservableCursor.ts
@@ -3,6 +3,8 @@
 import {Observable, Subscriber, Subject} from 'rxjs';
 import {gZone, forkZone, removeObserver} from './utils';
 
+declare let _;
+
 export class ObservableCursor<T> extends Observable<T[]> {
   private _zone: Zone;
   private _data: Array <T> = [];
diff --git a/src/utils.ts b/src/utils.ts
index 3ac64403..cdfe5b67 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -2,6 +2,8 @@
 
 import {Subscriber} from 'rxjs';
 
+declare let _;
+
 export declare type CallbacksObject = {
   onReady?: Function;
   onError?: Function;
@@ -27,7 +29,7 @@ declare const global;
 export const g =
   typeof global === 'object' ? global :
     typeof window === 'object' ? window :
-      typeof self === 'object' ? self : this;
+      typeof self === 'object' ? self : undefined;
 
 const METEOR_RXJS_ZONE = 'meteor-rxjs-zone';
 
diff --git a/tsconfig.json b/tsconfig.json
index 6d52b193..47131d4c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,8 +15,8 @@
     "rootDir": "./src"
   },
   "files": [
-    "src/index.ts",
-    "typings/index.d.ts"
+    "typings.d.ts",
+    "src/index.ts"
   ],
   "exclude": [
     "node_modules"
diff --git a/typings.d.ts b/typings.d.ts
new file mode 100644
index 00000000..724f795a
--- /dev/null
+++ b/typings.d.ts
@@ -0,0 +1,3 @@
+/// <reference types="zone.js" />
+/// <reference types="meteor-typings" />
+/// <reference types="@types/underscore" />
\ No newline at end of file
diff --git a/typings.json b/typings.json
deleted file mode 100644
index c5440d14..00000000
--- a/typings.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "globalDependencies": {
-    "meteor": "github:meteor-typings/meteor/1.3#955b89a4e2af892d1736bc570b490a97e860d5b7",
-    "zone.js": "npm:zone.js"
-  }
-}