diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m
index cc3a951ed..3ea1f50cb 100644
--- a/Signal/src/ViewControllers/HomeView/HomeViewController.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m
@@ -373,6 +373,10 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
 
 - (void)showNewConversationView
 {
+    OWSAssertIsOnMainThread();
+
+    DDLogInfo(@"%@ %s", self.logTag, __PRETTY_FUNCTION__);
+
     NewContactThreadViewController *viewController = [NewContactThreadViewController new];
 
     [self.contactsManager requestSystemContactsOnceWithCompletion:^(NSError *_Nullable error) {
@@ -1050,11 +1054,9 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
     if (![[self.uiDatabaseConnection ext:TSThreadDatabaseViewExtensionName] hasChangesForGroup:self.currentGrouping
                                                                                inNotifications:notifications]) {
         [self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
-            [self.self.threadMappings updateWithTransaction:transaction];
+            [self.threadMappings updateWithTransaction:transaction];
         }];
         [self checkIfEmptyView];
-        self.threadMappings = [[YapDatabaseViewMappings alloc] initWithGroups:@[ self.currentGrouping ]
-                                                                         view:TSThreadDatabaseViewExtensionName];
 
         return;
     }
diff --git a/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m b/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m
index 66c8addec..975834a9c 100644
--- a/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m
+++ b/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m
@@ -3,7 +3,6 @@
 //
 
 #import "ShowGroupMembersViewController.h"
-#import "HomeViewController.h"
 #import "Signal-Swift.h"
 #import "SignalApp.h"
 #import "ViewControllerUtils.h"
diff --git a/Signal/src/environment/SignalApp.m b/Signal/src/environment/SignalApp.m
index 739151820..9fed45388 100644
--- a/Signal/src/environment/SignalApp.m
+++ b/Signal/src/environment/SignalApp.m
@@ -211,9 +211,12 @@
              keyboardOnViewAppearing:(BOOL)keyboardOnViewAppearing
                  callOnViewAppearing:(BOOL)callOnViewAppearing
 {
+    OWSAssertIsOnMainThread();
     // At most one.
     OWSAssert(!keyboardOnViewAppearing || !callOnViewAppearing);
 
+    DDLogInfo(@"%@ %s", self.logTag, __PRETTY_FUNCTION__);
+
     if (!thread) {
         OWSFail(@"%@ Can't present nil thread.", self.logTag);
         return;
diff --git a/SignalMessaging/contacts/ViewControllerUtils.m b/SignalMessaging/contacts/ViewControllerUtils.m
index c4bc0b66c..eb9406cea 100644
--- a/SignalMessaging/contacts/ViewControllerUtils.m
+++ b/SignalMessaging/contacts/ViewControllerUtils.m
@@ -3,7 +3,6 @@
 //
 
 #import "ViewControllerUtils.h"
-#import "HomeViewController.h"
 #import "NSString+OWS.h"
 #import "PhoneNumber.h"
 #import <AVFoundation/AVFoundation.h>