diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 72ab4f151..2bd4d056f 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -1647,7 +1647,7 @@ typedef enum : NSUInteger {
     NSString *placeholderText = hasPendingFriendRequest ? NSLocalizedString(@"Pending Friend Request...", "") : NSLocalizedString(@"New Message", "");
     [self.inputToolbar setPlaceholderText:placeholderText];
     BOOL isContactFriend = self.thread.isContactFriend;
-    [self.inputToolbar setAttachmentButtonHidden:!isContactFriend];
+    [self.inputToolbar setAttachmentButtonHidden:(!isContactFriend && !self.thread.isGroupThread)];
 }
 
 #pragma mark - Identity
diff --git a/SignalMessaging/attachments/SignalAttachment.swift b/SignalMessaging/attachments/SignalAttachment.swift
index 70d32d730..dd07dd546 100644
--- a/SignalMessaging/attachments/SignalAttachment.swift
+++ b/SignalMessaging/attachments/SignalAttachment.swift
@@ -806,8 +806,8 @@ public class SignalAttachment: NSObject {
         var maxSizeRect = CGRect.zero
         maxSizeRect.size = CGSize(width: maxSize, height: maxSize)
         let newSize = AVMakeRect(aspectRatio: scrSize, insideRect: maxSizeRect).size
-        assert(newSize.width <= maxSize)
-        assert(newSize.height <= maxSize)
+//        assert(newSize.width <= maxSize)
+//        assert(newSize.height <= maxSize)
 
         let colorSpace = CGColorSpaceCreateDeviceRGB()
         let bitmapInfo: CGBitmapInfo = [
diff --git a/SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatMessage.swift b/SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatMessage.swift
index 067a20737..ef93d8100 100644
--- a/SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatMessage.swift	
+++ b/SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatMessage.swift	
@@ -123,7 +123,7 @@ public final class LokiPublicChatMessage : NSObject {
                 // Fields required by the .NET API
                 "version" : 1, "type" : type,
                 // Custom fields
-                "lokiType" : attachment.kind.rawValue, "server" : attachment.server, "id" : attachment.serverID, "contentType" : attachment.contentType, "size" : attachment.size, "fileName" : attachment.fileName, "flags" : attachment.flags, "width" : attachment.width, "height" : attachment.height, "url" : attachment.url
+                "lokiType" : attachment.kind.rawValue, "server" : attachment.server, "id" : attachment.serverID, "contentType" : attachment.contentType, "size" : attachment.size, "fileName" : attachment.fileName, "width" : attachment.width, "height" : attachment.height, "url" : attachment.url
             ]
             if let caption = attachment.caption {
                 attachmentValue["caption"] = attachment.caption