diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist
index 3b4e1293c..8631d8d3d 100644
--- a/Signal/Signal-Info.plist
+++ b/Signal/Signal-Info.plist
@@ -168,7 +168,11 @@
 	</array>
 	<key>UIStatusBarStyle</key>
 	<string>UIStatusBarStyleLightContent</string>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<true/>
+	<false/>
 </dict>
 </plist>
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
index c61a85b19..6eef3c5ed 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
@@ -233,7 +233,7 @@ NS_ASSUME_NONNULL_BEGIN
             // last line of the text (if any, or where it
             // would be).
             [self.messageBubbleView autoPinLeadingToTrailingEdgeOfView:self.avatarView offset:8],
-            [self.messageBubbleView autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.avatarView],
+            [self.messageBubbleView autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.avatarView],
         ]];
         
         [self.viewConstraints addObjectsFromArray:@[
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m
index 2eb7fdfaa..505877a06 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m
@@ -1503,10 +1503,11 @@ static const int kYapDatabaseRangeMaxLength = 25000;
                 // the previous message has the same sender name and
                 // no "date break" separates us.
                 BOOL shouldShowSenderName = YES;
+                NSString *_Nullable previousIncomingSenderId = nil;
                 if (previousViewItem && previousViewItem.interaction.interactionType == interactionType) {
 
                     TSIncomingMessage *previousIncomingMessage = (TSIncomingMessage *)previousViewItem.interaction;
-                    NSString *previousIncomingSenderId = previousIncomingMessage.authorId;
+                    previousIncomingSenderId = previousIncomingMessage.authorId;
                     OWSAssertDebug(previousIncomingSenderId.length > 0);
 
                     shouldShowSenderName
@@ -1539,9 +1540,8 @@ static const int kYapDatabaseRangeMaxLength = 25000;
                 // the next message has the same sender avatar and
                 // no "date break" separates us.
                 shouldShowSenderAvatar = YES;
-                if (nextViewItem && nextViewItem.interaction.interactionType == interactionType) {
-                    shouldShowSenderAvatar = (![NSObject isNullableObject:nextIncomingSenderId equalTo:incomingSenderId]
-                        || nextViewItem.hasCellHeader);
+                if (previousViewItem && previousViewItem.interaction.interactionType == interactionType) {
+                    shouldShowSenderAvatar = (![NSObject isNullableObject:previousIncomingSenderId equalTo:incomingSenderId]);
                 }
             }
         }
diff --git a/SignalMessaging/ViewControllers/OWSViewController.m b/SignalMessaging/ViewControllers/OWSViewController.m
index 53d87d88f..3feedfc1d 100644
--- a/SignalMessaging/ViewControllers/OWSViewController.m
+++ b/SignalMessaging/ViewControllers/OWSViewController.m
@@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 BOOL IsLandscapeOrientationEnabled(void)
 {
-    return YES;
+    return NO;
 }
 
 UIInterfaceOrientationMask DefaultUIInterfaceOrientationMask(void)
diff --git a/SignalServiceKit/src/Loki/Utilities/Debugging.swift b/SignalServiceKit/src/Loki/Utilities/Debugging.swift
index 0a263e6d1..2a68c09ec 100644
--- a/SignalServiceKit/src/Loki/Utilities/Debugging.swift
+++ b/SignalServiceKit/src/Loki/Utilities/Debugging.swift
@@ -2,7 +2,7 @@
 // For some reason NSLog doesn't seem to work. This is a workaround to still allow debugging from Obj-C.
 
 @objc(LKLogger)
-public final class Objc_Logger : NSObject {
+public final class ObjC_Logger : NSObject {
     
     private override init() { }