diff --git a/Pods b/Pods
index e54eb900c..7d20c06f1 160000
--- a/Pods
+++ b/Pods
@@ -1 +1 @@
-Subproject commit e54eb900c0c4be9646d4c7ed800c8ea45d275686
+Subproject commit 7d20c06f10623230848be112f493804b108e6aa1
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
index a661ebf3c..50979dd7a 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
@@ -3788,7 +3788,7 @@ isQuotedMessageAttachmentDownloaded:(BOOL)isQuotedMessageAttachmentDownloaded
                                                       attachmentIds:attachmentIds
                                                    expiresInSeconds:0
                                                     expireStartedAt:0
-                                                     isVoiceMessage:NO
+                                                     isVoiceMessage:isVoiceMessage
                                                    groupMetaMessage:TSGroupMessageNone
                                                       quotedMessage:quotedMessage];
 
diff --git a/Signal/test/util/OWSDatabaseConverterTest.m b/Signal/test/util/OWSDatabaseConverterTest.m
index 7055a442f..dd73a7e9f 100644
--- a/Signal/test/util/OWSDatabaseConverterTest.m
+++ b/Signal/test/util/OWSDatabaseConverterTest.m
@@ -141,8 +141,11 @@ NS_ASSUME_NONNULL_BEGIN
             [expectation fulfill];
         });
 
-        // YapDatabase can retain references to the registration
-        // connections for up to 5 seconds.
+        // YapDatabase can retain cached references to the registration
+        // connections for up to 5 seconds.  This can block deallocation
+        // of the YapDatabase instance.  Since we're trying to block on
+        // closing of the database (so that we can examine its contents
+        // on disk), we wait for the worst case duration.
         [self waitForExpectationsWithTimeout:5.0
                                      handler:^(NSError *error) {
                                          if (error) {