diff --git a/lib/pangea/practice_activities/multiple_choice_activity_model.dart b/lib/pangea/practice_activities/multiple_choice_activity_model.dart
index a381b1d3f..8ab9119b2 100644
--- a/lib/pangea/practice_activities/multiple_choice_activity_model.dart
+++ b/lib/pangea/practice_activities/multiple_choice_activity_model.dart
@@ -36,8 +36,8 @@ class MultipleChoiceActivity {
 
   Map<String, dynamic> toJson() {
     return {
-      'choices': choices,
-      'answer': answers,
+      'choices': List.from(choices),
+      'answer': List.from(answers),
     };
   }
 
diff --git a/lib/pangea/toolbar/message_practice/token_practice_button.dart b/lib/pangea/toolbar/message_practice/token_practice_button.dart
index 44e675b9e..6293fb615 100644
--- a/lib/pangea/toolbar/message_practice/token_practice_button.dart
+++ b/lib/pangea/toolbar/message_practice/token_practice_button.dart
@@ -80,6 +80,7 @@ class TokenPracticeButton extends StatelessWidget {
             token: token,
             target: _activity,
             emojiStyle: _emojiStyle,
+            width: tokenButtonHeight,
           );
         } else if (practiceMode == MessagePracticeMode.wordMorph) {
           child = _MorphMatchButton(
@@ -244,12 +245,14 @@ class _NoActivityContentButton extends StatelessWidget {
   final PangeaToken token;
   final PracticeTarget? target;
   final TextStyle emojiStyle;
+  final double width;
 
   const _NoActivityContentButton({
     required this.practiceMode,
     required this.token,
     required this.target,
     required this.emojiStyle,
+    required this.width,
   });
 
   @override
@@ -278,6 +281,7 @@ class _NoActivityContentButton extends StatelessWidget {
             context: context,
           ),
           child: SizedBox(
+            width: width,
             child: Center(
               child: MorphIcon(
                 morphFeature: morphFeature,