diff --git a/Example/Database/Tests/Unit/FPruneForestTest.m b/Example/Database/Tests/Unit/FPruneForestTest.m
index 0694ba7d258..a75fba2aefd 100644
--- a/Example/Database/Tests/Unit/FPruneForestTest.m
+++ b/Example/Database/Tests/Unit/FPruneForestTest.m
@@ -57,7 +57,7 @@ - (void) testKeepUnderPruneWorks {
     FPruneForest *forest = [FPruneForest empty];
     forest = [forest prunePath:[FPath pathWithString:@"foo/bar"]];
     forest = [forest keepPath:[FPath pathWithString:@"foo/bar/baz"]];
-    forest = [forest keepAll:[NSSet setWithArray:@[@"qux", @"quu"]] atPath:[FPath pathWithString:@"foo/bar"]];
+    [forest keepAll:[NSSet setWithArray:@[@"qux", @"quu"]] atPath:[FPath pathWithString:@"foo/bar"]];
 }
 
 - (void) testPruneUnderKeepThrows {
diff --git a/Example/DynamicLinks/Tests/FIRDLScionLoggingTest.m b/Example/DynamicLinks/Tests/FIRDLScionLoggingTest.m
index 532621174a6..47778c34708 100644
--- a/Example/DynamicLinks/Tests/FIRDLScionLoggingTest.m
+++ b/Example/DynamicLinks/Tests/FIRDLScionLoggingTest.m
@@ -60,7 +60,7 @@ - (void)clearConditionalUserProperty:(nonnull NSString *)userPropertyName
 - (nonnull NSArray<FIRAConditionalUserProperty *> *)
     conditionalUserProperties:(nonnull NSString *)origin
            propertyNamePrefix:(nonnull NSString *)propertyNamePrefix {
-  return nil;
+  return @[];
 }
 
 - (NSInteger)maxUserProperties:(nonnull NSString *)origin {
diff --git a/Example/Firebase.xcodeproj/xcshareddata/xcschemes/AllUnitTests_iOS.xcscheme b/Example/Firebase.xcodeproj/xcshareddata/xcschemes/AllUnitTests_iOS.xcscheme
index 52626e65803..52d38c8a9b4 100644
--- a/Example/Firebase.xcodeproj/xcshareddata/xcschemes/AllUnitTests_iOS.xcscheme
+++ b/Example/Firebase.xcodeproj/xcshareddata/xcschemes/AllUnitTests_iOS.xcscheme
@@ -11,7 +11,7 @@
             buildForRunning = "YES"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "DE3373891E73773400881891"
@@ -25,7 +25,7 @@
             buildForRunning = "YES"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "DE9314DD1E86C6BE0083EDBF"
@@ -39,7 +39,7 @@
             buildForRunning = "YES"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "DEE14D581E84464D006FA992"
@@ -53,7 +53,7 @@
             buildForRunning = "YES"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "DE7B8D1C1E8EF078009EB6DF"
@@ -67,7 +67,7 @@
             buildForRunning = "YES"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "DE9315A61E8738460083EDBF"
@@ -81,7 +81,7 @@
             buildForRunning = "YES"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "DEB13A0A1E73507E00AC236D"
@@ -95,7 +95,7 @@
             buildForRunning = "NO"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "DE7B8D041E8EF077009EB6DF"
@@ -104,6 +104,20 @@
                ReferencedContainer = "container:Firebase.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DEDFF0121FD6135D00F7D466"
+               BuildableName = "DynamicLinks_Tests_iOS.xctest"
+               BlueprintName = "DynamicLinks_Tests_iOS"
+               ReferencedContainer = "container:Firebase.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
diff --git a/Example/Messaging/Tests/FIRMessagingAnalyticsTest.m b/Example/Messaging/Tests/FIRMessagingAnalyticsTest.m
index 2a60efa5362..c8f7e26b803 100644
--- a/Example/Messaging/Tests/FIRMessagingAnalyticsTest.m
+++ b/Example/Messaging/Tests/FIRMessagingAnalyticsTest.m
@@ -87,7 +87,7 @@ - (void)clearConditionalUserProperty:(nonnull NSString *)userPropertyName
 - (nonnull NSArray<FIRAConditionalUserProperty *> *)
 conditionalUserProperties:(nonnull NSString *)origin
 propertyNamePrefix:(nonnull NSString *)propertyNamePrefix {
-  return nil;
+  return @[];
 }
 
 - (NSInteger)maxUserProperties:(nonnull NSString *)origin {
diff --git a/Firebase/DynamicLinks/FDLURLComponents/FDLURLComponents.m b/Firebase/DynamicLinks/FDLURLComponents/FDLURLComponents.m
index 05c708bf4ff..9c6a0062ae0 100644
--- a/Firebase/DynamicLinks/FDLURLComponents/FDLURLComponents.m
+++ b/Firebase/DynamicLinks/FDLURLComponents/FDLURLComponents.m
@@ -25,7 +25,7 @@
 /// The exact behavior of dict[key] = value is unclear when value is nil. This function safely adds
 /// the key-value pair to the dictionary, even when value is nil.
 /// This function will treat empty string in the same way as nil.
-NS_INLINE void FDLSafelyAddKeyValuePairToDictionary(id<NSCopying> key,
+NS_INLINE void FDLSafelyAddKeyValuePairToDictionary(NSString *key,
                                                     NSString *stringValue,
                                                     NSMutableDictionary *dictionary) {
   if (stringValue != nil && stringValue.length > 0) {
diff --git a/Firebase/DynamicLinks/FIRDLDefaultRetrievalProcessV2.m b/Firebase/DynamicLinks/FIRDLDefaultRetrievalProcessV2.m
index 39a48ed7e04..efdd51fcc8a 100644
--- a/Firebase/DynamicLinks/FIRDLDefaultRetrievalProcessV2.m
+++ b/Firebase/DynamicLinks/FIRDLDefaultRetrievalProcessV2.m
@@ -213,7 +213,7 @@ - (void)retrievePendingDynamicLinkInternal {
   return [self.requestResults filteredArrayUsingPredicate:predicate];
 }
 
-- (FIRDLRetrievalProcessResult *)resultWithUniqueMatchedDynamicLink {
+- (nullable FIRDLRetrievalProcessResult *)resultWithUniqueMatchedDynamicLink {
   // return result with unique-matched dynamic link if found
   NSArray<FIRDLRetrievalProcessResult *> *foundResultsWithDynamicLinks =
       [self foundResultsWithDynamicLinks];
diff --git a/Firebase/DynamicLinks/FIRDynamicLinks.m b/Firebase/DynamicLinks/FIRDynamicLinks.m
index cf02f35c4f8..f12c0ed84c0 100644
--- a/Firebase/DynamicLinks/FIRDynamicLinks.m
+++ b/Firebase/DynamicLinks/FIRDynamicLinks.m
@@ -188,8 +188,8 @@ - (void)configureDynamicLinks:(FIRApp *)app {
                                                       service:kFIRServiceDynamicLinks
                                                        reason:errorDescription];
   }
-  [app sendLogsWithServiceName:kFIRServiceDynamicLinks version:kFIRDLVersion error:error];
   if (error) {
+    [app sendLogsWithServiceName:kFIRServiceDynamicLinks version:kFIRDLVersion error:error];
     NSString *message = nil;
     if (options.usingOptionsFromDefaultPlist) {
       // Configured using plist file