diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index a79cbef..a43cf3e 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -171,6 +171,10 @@
         "context": "Visible in the model dialog"
     },
     "modelDialogAddAllowanceTitle": "Allow Proxy",
+    "@modelDialogAddAllowanceTitle": {
+        "description": "Title of the allow proxy dialog",
+        "context": "Visible in the model dialog"
+    },
     "modelDialogAddAllowanceDescription": "Ollama App must check if the entered model is valid. For that, we normally send a web request to the Ollama model list and check the status code, but because you're using the web client, we can't do that directly. Instead, the app will send the request to a different api, hosted by JHubi1, to check for us.\nThis is a one-time request and will only be sent when you add a new model.\nYour IP address will be sent with the request and might be stored for up to ten minutes to prevent spamming with potential harmful intentions.\nIf you accept, your selection will be remembered in the future; if not, nothing will be sent and the model won't be added.",
     "@modelDialogAddAllowanceDescription": {
         "description": "Description of the allow proxy dialog",
@@ -598,6 +602,10 @@
         "context": "Visible in the settings view"
     },
     "settingsVoiceTtsNotSupportedDescription": "Text-to-speech services are not supported for the selected language. Select a different language in the language drawer to reenable them.\nOther services like voice recognition and AI thinking will still work as usual, but interaction might not be as fluent.",
+    "@settingsVoiceTtsNotSupportedDescription": {
+        "description": "Description of the text-to-speech not supported message",
+        "context": "Visible in the settings view"
+    },
     "settingsVoicePermissionNot": "Permissions not granted",
     "@settingsVoicePermissionNot": {
         "description": "Text displayed when voice permissions are not granted",
diff --git a/lib/screen_settings.dart b/lib/screen_settings.dart
index 2bb870c..194460e 100644
--- a/lib/screen_settings.dart
+++ b/lib/screen_settings.dart
@@ -8,7 +8,6 @@ import 'worker/haptic.dart';
 import 'worker/update.dart';
 import 'worker/desktop.dart';
 import 'worker/setter.dart';
-import 'worker/clients.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 import 'settings/behavior.dart';
@@ -416,7 +415,7 @@ class _ScreenSettingsState extends State<ScreenSettings> {
     }
     return PopScope(
         canPop: !hostLoading,
-        onPopInvoked: (didPop) {
+        onPopInvokedWithResult: (didPop, result) {
           settingsOpen = false;
           FocusManager.instance.primaryFocus?.unfocus();
         },
diff --git a/lib/screen_voice.dart b/lib/screen_voice.dart
index 575faef..7dccb54 100644
--- a/lib/screen_voice.dart
+++ b/lib/screen_voice.dart
@@ -199,7 +199,7 @@ class _ScreenVoiceState extends State<ScreenVoice> {
         data: themeDark(),
         child: PopScope(
             canPop: !aiThinking,
-            onPopInvoked: (didPop) {
+            onPopInvokedWithResult: (didPop, result) {
               if (!didPop) return;
               speaking = false;
               voice.stop();
diff --git a/lib/settings/voice.dart b/lib/settings/voice.dart
index 7e082d5..a62f22a 100644
--- a/lib/settings/voice.dart
+++ b/lib/settings/voice.dart
@@ -212,7 +212,7 @@ class _ScreenSettingsVoiceState extends State<ScreenSettingsVoice> {
                                     }
 
                                     return PopScope(
-                                        onPopInvoked: (didPop) {
+                                        onPopInvokedWithResult: (didPop, result) {
                                           if (usedIndex == -1) return;
                                           prefs!.setString(
                                               "voiceLanguage",
diff --git a/lib/worker/setter.dart b/lib/worker/setter.dart
index aaa4f8e..33b93b8 100644
--- a/lib/worker/setter.dart
+++ b/lib/worker/setter.dart
@@ -89,7 +89,7 @@ void setModel(BuildContext context, Function setState) {
     setModalState = setLocalState;
     return PopScope(
         canPop: false,
-        onPopInvoked: (didPop) async {
+        onPopInvokedWithResult: (didPop, result) async {
           if (!loaded) return;
           loaded = false;
           bool preload = false;