diff --git a/Signal/SignalUBSan.supp b/Signal/SignalUBSan.supp
index 5a59495c4..5b1efedda 100644
--- a/Signal/SignalUBSan.supp
+++ b/Signal/SignalUBSan.supp
@@ -7,6 +7,10 @@ bool:YapDatabaseAutoViewTransaction.m
 # SocketRocket
 bool:SRWebSocket.m
 
+# SQLCipher
+shift-base:sqlite3.c
+shift-exponent:sqlite3.c
+
 # Curve25519 expected
 shift-base:curve25519-donna.c
 shift-base:ge_scalarmult_base.c
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 04b0838bc..775fa736d 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -54,6 +54,7 @@
 #import <SignalMessaging/OWSNavigationController.h>
 #import <SignalMessaging/OWSUnreadIndicator.h>
 #import <SignalMessaging/OWSUserProfile.h>
+#import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalMessaging/ThreadUtil.h>
 #import <SignalMessaging/UIUtil.h>
 #import <SignalMessaging/UIViewController+OWS.h>