diff --git a/lib/pangea/matrix_event_wrappers/practice_activity_event.dart b/lib/pangea/matrix_event_wrappers/practice_activity_event.dart
index 5ab1cce31..3de2e2ffc 100644
--- a/lib/pangea/matrix_event_wrappers/practice_activity_event.dart
+++ b/lib/pangea/matrix_event_wrappers/practice_activity_event.dart
@@ -36,13 +36,8 @@ class PracticeActivityEvent {
   }
 
   PracticeActivityModel get practiceActivity {
-    try {
-      _content ??= event.getPangeaContent<PracticeActivityModel>();
-      return _content!;
-    } catch (e, s) {
-      final contentMap = event.content;
-      rethrow;
-    }
+    _content ??= event.getPangeaContent<PracticeActivityModel>();
+    return _content!;
   }
 
   /// All completion records assosiated with this activity
diff --git a/lib/pangea/widgets/chat/missing_voice_button.dart b/lib/pangea/widgets/chat/missing_voice_button.dart
index 3baa8422e..b1f12c626 100644
--- a/lib/pangea/widgets/chat/missing_voice_button.dart
+++ b/lib/pangea/widgets/chat/missing_voice_button.dart
@@ -51,9 +51,9 @@ class MissingVoiceButton extends StatelessWidget {
             onPressed: () => launchTTSSettings,
             // commenting out as suspecting this is causing an issue
             // #freeze-activity
-            // style: const ButtonStyle(
-            //   tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-            // ),
+            style: const ButtonStyle(
+              tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+            ),
             child: Text(L10n.of(context)!.openVoiceSettings),
           ),
         ],
diff --git a/lib/pangea/widgets/practice_activity/multiple_choice_activity.dart b/lib/pangea/widgets/practice_activity/multiple_choice_activity.dart
index 8a34dfc6d..16b8e44a6 100644
--- a/lib/pangea/widgets/practice_activity/multiple_choice_activity.dart
+++ b/lib/pangea/widgets/practice_activity/multiple_choice_activity.dart
@@ -2,17 +2,15 @@ import 'dart:developer';
 
 import 'package:collection/collection.dart';
 import 'package:fluffychat/pangea/choreographer/widgets/choice_array.dart';
-import 'package:fluffychat/pangea/controllers/my_analytics_controller.dart';
 import 'package:fluffychat/pangea/models/practice_activities.dart/practice_activity_model.dart';
 import 'package:fluffychat/pangea/models/practice_activities.dart/practice_activity_record_model.dart';
 import 'package:fluffychat/pangea/widgets/practice_activity/practice_activity_card.dart';
-import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 /// The multiple choice activity view
 class MultipleChoiceActivity extends StatefulWidget {
-  final MessagePracticeActivityCardState practiceCardController;
+  final PracticeActivityCardState practiceCardController;
   final PracticeActivityModel currentActivity;
 
   const MultipleChoiceActivity({
@@ -65,18 +63,19 @@ class MultipleChoiceActivityState extends State<MultipleChoiceActivity> {
       return;
     }
 
-    MatrixState.pangeaController.myAnalytics.setState(
-      AnalyticsStream(
-        // note - this maybe should be the activity event id
-        eventId:
-            widget.practiceCardController.widget.pangeaMessageEvent.eventId,
-        roomId: widget.practiceCardController.widget.pangeaMessageEvent.room.id,
-        constructs: currentRecordModel!.latestResponse!.toUses(
-          widget.practiceCardController.currentActivity!,
-          widget.practiceCardController.metadata,
-        ),
-      ),
-    );
+    // #freeze-activity
+    // MatrixState.pangeaController.myAnalytics.setState(
+    //   AnalyticsStream(
+    //     // note - this maybe should be the activity event id
+    //     eventId:
+    //         widget.practiceCardController.widget.pangeaMessageEvent.eventId,
+    //     roomId: widget.practiceCardController.widget.pangeaMessageEvent.room.id,
+    //     constructs: currentRecordModel!.latestResponse!.toUses(
+    //       widget.practiceCardController.currentActivity!,
+    //       widget.practiceCardController.metadata,
+    //     ),
+    //   ),
+    // );
 
     // If the selected choice is correct, send the record and get the next activity
     if (widget.currentActivity.content.isCorrect(value, index)) {
diff --git a/lib/pangea/widgets/practice_activity/practice_activity_card.dart b/lib/pangea/widgets/practice_activity/practice_activity_card.dart
index 62dadc78b..7a2af7fc9 100644
--- a/lib/pangea/widgets/practice_activity/practice_activity_card.dart
+++ b/lib/pangea/widgets/practice_activity/practice_activity_card.dart
@@ -36,11 +36,10 @@ class PracticeActivityCard extends StatefulWidget {
   });
 
   @override
-  MessagePracticeActivityCardState createState() =>
-      MessagePracticeActivityCardState();
+  PracticeActivityCardState createState() => PracticeActivityCardState();
 }
 
-class MessagePracticeActivityCardState extends State<PracticeActivityCard> {
+class PracticeActivityCardState extends State<PracticeActivityCard> {
   PracticeActivityModel? currentActivity;
   PracticeActivityRecordModel? currentCompletionRecord;
   bool fetchingActivity = false;
diff --git a/lib/pangea/widgets/practice_activity/word_focus_listening_activity.dart b/lib/pangea/widgets/practice_activity/word_focus_listening_activity.dart
index 720f784ba..8e22aced8 100644
--- a/lib/pangea/widgets/practice_activity/word_focus_listening_activity.dart
+++ b/lib/pangea/widgets/practice_activity/word_focus_listening_activity.dart
@@ -13,7 +13,7 @@ import 'package:flutter/material.dart';
 
 class WordFocusListeningActivity extends StatefulWidget {
   final PracticeActivityModel activity;
-  final MessagePracticeActivityCardState practiceCardController;
+  final PracticeActivityCardState practiceCardController;
 
   const WordFocusListeningActivity({
     super.key,