diff --git a/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift b/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift
index 458517b48..39c31fe4e 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift
+++ b/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift
@@ -135,7 +135,7 @@ public class ConversationMediaView: UIView {
         } else if attachmentStream.isVideo {
             configureForVideo(attachmentStream: attachmentStream)
         } else {
-//            owsFailDebug("Attachment has unexpected type.")
+            owsFailDebug("Attachment has unexpected type.")
             configure(forError: .invalid)
         }
     }
diff --git a/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift b/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift
index 6c691dd88..4f3bcd9a0 100644
--- a/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift
+++ b/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift
@@ -229,8 +229,8 @@ class AttachmentCaptionViewController: OWSViewController {
 
         let contentSize = textView.sizeThatFits(CGSize(width: textView.width(), height: CGFloat.greatestFiniteMagnitude))
 
-            // `textView.contentSize` isn't accurate when restoring a multiline draft, so we compute it here.
-            textView.contentSize = contentSize
+        // `textView.contentSize` isn't accurate when restoring a multiline draft, so we compute it here.
+        textView.contentSize = contentSize
 
         let minHeight: CGFloat = textView.font?.lineHeight ?? 0
         let maxHeight = minHeight * 4
diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift
index e759ce00b..6c79fde1b 100644
--- a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift
+++ b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift
@@ -11,7 +11,6 @@ public protocol ImageEditorBrushViewControllerDelegate: class {
 
 // MARK: -
 
-// A view for editing text item in image editor.
 public class ImageEditorBrushViewController: OWSViewController {
 
     private weak var delegate: ImageEditorBrushViewControllerDelegate?