diff --git a/packages/database-types/index.d.ts b/packages/database-types/index.d.ts
index d1e704430c6..799faf1b22d 100644
--- a/packages/database-types/index.d.ts
+++ b/packages/database-types/index.d.ts
@@ -16,7 +16,7 @@
 
 import { FirebaseApp } from '@firebase/app-types';
 
-export interface DataSnapshot {
+export interface DataSnapshot<T = any> {
   child(path: string): DataSnapshot;
   exists(): boolean;
   exportVal(): any;
@@ -28,7 +28,7 @@ export interface DataSnapshot {
   numChildren(): number;
   ref: Reference;
   toJSON(): Object | null;
-  val(): any;
+  val(): T | null;
 }
 
 export class FirebaseDatabase {
diff --git a/packages/firebase/index.d.ts b/packages/firebase/index.d.ts
index b551d344acc..7973c29473a 100644
--- a/packages/firebase/index.d.ts
+++ b/packages/firebase/index.d.ts
@@ -424,7 +424,7 @@ declare namespace firebase.auth.Auth {
 }
 
 declare namespace firebase.database {
-  interface DataSnapshot {
+  interface DataSnapshot<T = any> {
     child(path: string): firebase.database.DataSnapshot;
     exists(): boolean;
     exportVal(): any;
@@ -434,7 +434,7 @@ declare namespace firebase.database {
     hasChildren(): boolean;
     key: string | null;
     numChildren(): number;
-    val(): any;
+    val(): T | null;
     ref: firebase.database.Reference;
     toJSON(): Object | null;
   }
diff --git a/packages/firestore/src/remote/serializer.ts b/packages/firestore/src/remote/serializer.ts
index ce245ee883e..08d5b33c660 100644
--- a/packages/firestore/src/remote/serializer.ts
+++ b/packages/firestore/src/remote/serializer.ts
@@ -1129,8 +1129,8 @@ export class JsonProtoSerializer {
     } else if (filter.fieldFilter !== undefined) {
       return [this.fromRelationFilter(filter)];
     } else if (filter.compositeFilter !== undefined) {
-      return filter.compositeFilter
-        .filters!.map(f => this.fromFilter(f))
+      return filter.compositeFilter.filters!
+        .map(f => this.fromFilter(f))
         .reduce((accum, current) => accum.concat(current));
     } else {
       return fail('Unknown filter: ' + JSON.stringify(filter));
diff --git a/tools/config.js b/tools/config.js
index de0e8953225..380ed795d56 100644
--- a/tools/config.js
+++ b/tools/config.js
@@ -63,9 +63,7 @@ Promise.resolve(userToken || cachedToken)
         }
       ]);
 
-      const {
-        projectId: { id }
-      } = response;
+      const { projectId: { id } } = response;
 
       return id;
     })();