diff --git a/ts/groups.ts b/ts/groups.ts
index b6ff1fca1a50..70b0ab2f492d 100644
--- a/ts/groups.ts
+++ b/ts/groups.ts
@@ -1425,8 +1425,7 @@ async function applyGroupChange({
   if (actions.modifyMemberAccess) {
     result.accessControl = {
       ...result.accessControl,
-      attributes:
-        actions.modifyMemberAccess.membersAccess || ACCESS_ENUM.MEMBER,
+      members: actions.modifyMemberAccess.membersAccess || ACCESS_ENUM.MEMBER,
     };
   }
 
diff --git a/ts/textsecure/MessageReceiver.ts b/ts/textsecure/MessageReceiver.ts
index 773178846571..bd850e5106f1 100644
--- a/ts/textsecure/MessageReceiver.ts
+++ b/ts/textsecure/MessageReceiver.ts
@@ -1344,15 +1344,18 @@ class MessageReceiverInner extends EventTarget {
     ev.sender = envelope.source;
     ev.senderUuid = envelope.sourceUuid;
     ev.senderDevice = envelope.sourceDevice;
+
+    const groupIdBuffer = groupId ? groupId.toArrayBuffer() : null;
+
     ev.typing = {
       typingMessage,
       timestamp: timestamp ? timestamp.toNumber() : Date.now(),
       groupId:
-        groupId && groupId.buffer.byteLength < 45
+        groupIdBuffer && groupIdBuffer.byteLength <= 16
           ? groupId.toString('binary')
           : null,
       groupV2Id:
-        groupId && groupId.buffer.byteLength >= 45
+        groupIdBuffer && groupIdBuffer.byteLength > 16
           ? groupId.toString('base64')
           : null,
       started: