diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleShapeView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleShapeView.m
index dd9cd8ba0..29cad0912 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleShapeView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleShapeView.m
@@ -50,7 +50,7 @@ typedef NS_ENUM(NSUInteger, OWSBubbleShapeViewMode) {
 
 - (instancetype)initDraw
 {
-    self = [super init];
+    self = [super initWithFrame:CGRectZero];
     if (!self) {
         return self;
     }
@@ -64,7 +64,7 @@ typedef NS_ENUM(NSUInteger, OWSBubbleShapeViewMode) {
 
 - (instancetype)initShadow
 {
-    self = [super init];
+    self = [super initWithFrame:CGRectZero];
     if (!self) {
         return self;
     }
@@ -78,7 +78,7 @@ typedef NS_ENUM(NSUInteger, OWSBubbleShapeViewMode) {
 
 - (instancetype)initClip
 {
-    self = [super init];
+    self = [super initWithFrame:CGRectZero];
     if (!self) {
         return self;
     }
@@ -92,7 +92,7 @@ typedef NS_ENUM(NSUInteger, OWSBubbleShapeViewMode) {
 
 - (instancetype)initInnerShadowWithColor:(UIColor *)color radius:(CGFloat)radius opacity:(float)opacity
 {
-    self = [super init];
+    self = [super initWithFrame:CGRectZero];
     if (!self) {
         return self;
     }
diff --git a/SignalMessaging/utils/BlockListCache.swift b/SignalMessaging/utils/BlockListCache.swift
index ebc103179..77f0c0295 100644
--- a/SignalMessaging/utils/BlockListCache.swift
+++ b/SignalMessaging/utils/BlockListCache.swift
@@ -93,7 +93,7 @@ public class BlockListCache: NSObject {
                 blockedGroupIds.contains(groupThread.groupModel.groupId)
             }
         default:
-            owsFail("\(self.logTag) in \(#function) unexepected thread type: \(type(of: thread))")
+            owsFailDebug("\(self.logTag) in \(#function) unexpected thread type: \(type(of: thread))")
             return false
         }
     }
diff --git a/SignalServiceKit/src/Messages/Interactions/TSInteraction.m b/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
index 06f42ecc4..b77dd9025 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
@@ -172,8 +172,8 @@ NSString *NSStringFromOWSInteractionType(OWSInteractionType value)
 
 - (void)saveWithTransaction:(YapDatabaseReadWriteTransaction *)transaction {
     if (!self.uniqueId) {
-        OWSFailDebug(self.uniqueId);
-        self.uniqueId = [NSUUID new];
+        OWSFailDebug(@"Missing uniqueId.");
+        self.uniqueId = [NSUUID new].UUIDString;
     }
 
     [super saveWithTransaction:transaction];
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SessionStore.m b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SessionStore.m
index 86acee97f..be6b65f53 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SessionStore.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SessionStore.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSFileSystem.h"
 #import "OWSPrimaryStorage+SessionStore.h"
+#import "OWSFileSystem.h"
 #import "SSKEnvironment.h"
 #import "YapDatabaseConnection+OWS.h"
 #import "YapDatabaseTransaction+OWS.h"
@@ -61,7 +61,7 @@ NSString *const kSessionStoreDBConnectionKey = @"kSessionStoreDBConnectionKey";
 }
 
 #pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#pragma clang diagnostic ignored "-Wdeprecated-implementations"
 - (NSArray *)subDevicesSessions:(NSString *)contactIdentifier protocolContext:(nullable id)protocolContext
 {
     OWSAssertDebug(contactIdentifier.length > 0);