diff --git a/src/angularfire2.ts b/src/angularfire2.ts
index 0095e190a..a84759658 100644
--- a/src/angularfire2.ts
+++ b/src/angularfire2.ts
@@ -9,7 +9,8 @@ import {
   FirebaseConfig,
   FirebaseApp,
   WindowLocation,
-  FirebaseUserConfig
+  FirebaseUserConfig,
+  FirebaseAuthConfig
 } from './tokens';
 import {
   APP_INITIALIZER,
@@ -114,7 +115,7 @@ export class AngularFireModule {
 		providers: [
 		  { provide: FirebaseUserConfig, useValue: config },
 		  { provide: FirebaseConfig, useFactory: _getDefaultFirebase, deps: [FirebaseUserConfig] },
-      firebaseAuthConfig(authConfig)
+      { provide: FirebaseAuthConfig, useValue: authConfig }
 		]
 	}
   }
diff --git a/src/database/database.ts b/src/database/database.ts
index eee0a3c0d..d2ee4c12d 100644
--- a/src/database/database.ts
+++ b/src/database/database.ts
@@ -4,7 +4,7 @@ import { FirebaseAppConfig } from '../angularfire2';
 import { FirebaseListFactory } from './index';
 import { FirebaseListFactoryOpts, FirebaseObjectFactoryOpts } from '../interfaces';
 import * as utils from '../utils';
-import { 
+import {
   FirebaseListObservable,
   FirebaseObjectObservable,
   FirebaseObjectFactory
@@ -13,7 +13,7 @@ import {
 @Injectable()
 export class AngularFireDatabase {
   constructor(@Inject(FirebaseConfig) private fbConfig:FirebaseAppConfig,
-    @Inject(FirebaseApp) private fbApp:firebase.app.App) {}
+    @Inject(FirebaseApp) private fbApp:any) {}
   list (urlOrRef:string | firebase.database.Reference, opts?:FirebaseListFactoryOpts):FirebaseListObservable<any[]> {
     return utils.checkForUrlOrFirebaseRef(urlOrRef, {
       isUrl: () => FirebaseListFactory(this.fbApp.database().refFromURL(getAbsUrl(this.fbConfig, <string>urlOrRef)), opts),
diff --git a/tsconfig.publish.es5.json b/tsconfig.publish.es5.json
index 3fbcfaf24..2def0360f 100644
--- a/tsconfig.publish.es5.json
+++ b/tsconfig.publish.es5.json
@@ -21,7 +21,6 @@
     "src/database/index.ts",
     "src/auth/auth.ts",
     "typings/index.d.ts",
-    "manual_typings/firebase3/firebase3.d.ts",
     "node_modules/zone.js/dist/zone.js.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/tsconfig.publish.es6.json b/tsconfig.publish.es6.json
index 7afe17a2d..afe24ffc3 100644
--- a/tsconfig.publish.es6.json
+++ b/tsconfig.publish.es6.json
@@ -22,7 +22,6 @@
     "src/database/index.ts",
     "src/auth/auth.ts",
     "typings/index.d.ts",
-    "manual_typings/firebase3/firebase3.d.ts",
     "node_modules/zone.js/dist/zone.js.d.ts"
   ],
   "angularCompilerOptions": {