diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index e64aa370bd2e..d1f544cd5b50 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.12.10+2
+
+* Fixed analyzer warnings about unused fields.
+
 ## 0.12.10+1
 
 * Formatted method documentations.
diff --git a/packages/cloud_firestore/lib/src/document_change.dart b/packages/cloud_firestore/lib/src/document_change.dart
index 8409d512a43e..02f797a65d24 100644
--- a/packages/cloud_firestore/lib/src/document_change.dart
+++ b/packages/cloud_firestore/lib/src/document_change.dart
@@ -23,7 +23,7 @@ enum DocumentChangeType {
 /// It contains the document affected and the type of change that occurred
 /// (added, modified, or removed).
 class DocumentChange {
-  DocumentChange._(Map<dynamic, dynamic> data, this._firestore)
+  DocumentChange._(Map<dynamic, dynamic> data, Firestore firestore)
       : oldIndex = data['oldIndex'],
         newIndex = data['newIndex'],
         document = DocumentSnapshot._(
@@ -31,14 +31,12 @@ class DocumentChange {
           _asStringKeyedMap(data['document']),
           SnapshotMetadata._(data["metadata"]["hasPendingWrites"],
               data["metadata"]["isFromCache"]),
-          _firestore,
+          firestore,
         ),
         type = DocumentChangeType.values.firstWhere((DocumentChangeType type) {
           return type.toString() == data['type'];
         });
 
-  final Firestore _firestore;
-
   /// The type of change that occurred (added, modified, or removed).
   final DocumentChangeType type;
 
diff --git a/packages/cloud_firestore/lib/src/query_snapshot.dart b/packages/cloud_firestore/lib/src/query_snapshot.dart
index 1ecb0bd54fe1..9d6a53fb6f2d 100644
--- a/packages/cloud_firestore/lib/src/query_snapshot.dart
+++ b/packages/cloud_firestore/lib/src/query_snapshot.dart
@@ -6,7 +6,7 @@ part of cloud_firestore;
 
 /// A QuerySnapshot contains zero or more DocumentSnapshot objects.
 class QuerySnapshot {
-  QuerySnapshot._(Map<dynamic, dynamic> data, this._firestore)
+  QuerySnapshot._(Map<dynamic, dynamic> data, Firestore firestore)
       : documents = List<DocumentSnapshot>.generate(data['documents'].length,
             (int index) {
           return DocumentSnapshot._(
@@ -16,14 +16,14 @@ class QuerySnapshot {
               data['metadatas'][index]['hasPendingWrites'],
               data['metadatas'][index]['isFromCache'],
             ),
-            _firestore,
+            firestore,
           );
         }),
         documentChanges = List<DocumentChange>.generate(
             data['documentChanges'].length, (int index) {
           return DocumentChange._(
             data['documentChanges'][index],
-            _firestore,
+            firestore,
           );
         }),
         metadata = SnapshotMetadata._(
@@ -39,6 +39,4 @@ class QuerySnapshot {
   final List<DocumentChange> documentChanges;
 
   final SnapshotMetadata metadata;
-
-  final Firestore _firestore;
 }
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index 0f4178699fb9..eeb1f8a2405e 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/cloud_firestore
-version: 0.12.10+1
+version: 0.12.10+2
 
 flutter:
   plugin:
diff --git a/packages/firebase_performance/CHANGELOG.md b/packages/firebase_performance/CHANGELOG.md
index 598fdde5d645..de495c1f7b24 100644
--- a/packages/firebase_performance/CHANGELOG.md
+++ b/packages/firebase_performance/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.1+3
+
+* Fixed analyzer warnings about unused fields.
+
 ## 0.3.1+2
 
 * Updated README instructions for contributing for consistency with other Flutterfire plugins.
diff --git a/packages/firebase_performance/lib/src/http_metric.dart b/packages/firebase_performance/lib/src/http_metric.dart
index 2586a1455cc5..e2e47f854126 100644
--- a/packages/firebase_performance/lib/src/http_metric.dart
+++ b/packages/firebase_performance/lib/src/http_metric.dart
@@ -24,9 +24,6 @@ class HttpMetric extends PerformanceAttributes {
   final String url;
   final HttpMethod httpMethod;
 
-  @override
-  bool _hasStarted = false;
-
   @override
   bool _hasStopped = false;
 
@@ -127,7 +124,6 @@ class HttpMetric extends PerformanceAttributes {
   Future<void> start() {
     if (_hasStopped) return Future<void>.value(null);
 
-    _hasStarted = true;
     return FirebasePerformance.channel.invokeMethod<void>(
       'HttpMetric#start',
       <String, dynamic>{'handle': _handle},
diff --git a/packages/firebase_performance/lib/src/performance_attributes.dart b/packages/firebase_performance/lib/src/performance_attributes.dart
index 96a77a009f57..551990eddc38 100644
--- a/packages/firebase_performance/lib/src/performance_attributes.dart
+++ b/packages/firebase_performance/lib/src/performance_attributes.dart
@@ -17,7 +17,6 @@ abstract class PerformanceAttributes {
 
   final Map<String, String> _attributes = <String, String>{};
 
-  bool get _hasStarted;
   bool get _hasStopped;
 
   int get _handle;
diff --git a/packages/firebase_performance/lib/src/trace.dart b/packages/firebase_performance/lib/src/trace.dart
index 873a138c7392..0c6d7803b272 100644
--- a/packages/firebase_performance/lib/src/trace.dart
+++ b/packages/firebase_performance/lib/src/trace.dart
@@ -29,7 +29,6 @@ class Trace extends PerformanceAttributes {
 
   final Map<String, int> _metrics = <String, int>{};
 
-  @override
   bool _hasStarted = false;
 
   @override
diff --git a/packages/firebase_performance/pubspec.yaml b/packages/firebase_performance/pubspec.yaml
index ec90bc828f4f..ebb50bca838a 100644
--- a/packages/firebase_performance/pubspec.yaml
+++ b/packages/firebase_performance/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Google Performance Monitoring for Firebase, an a
   iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_performance
-version: 0.3.1+2
+version: 0.3.1+3
 
 dependencies:
   flutter:
@@ -28,4 +28,4 @@ flutter:
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"
-  flutter: ">=1.9.1+hotfix.5 <2.0.0"
\ No newline at end of file
+  flutter: ">=1.9.1+hotfix.5 <2.0.0"