diff --git a/lib/api/impl/privacy_idea_container_api.dart b/lib/api/impl/privacy_idea_container_api.dart
index d1e273b1..be63ff7a 100644
--- a/lib/api/impl/privacy_idea_container_api.dart
+++ b/lib/api/impl/privacy_idea_container_api.dart
@@ -250,7 +250,12 @@ class PiContainerApi implements TokenContainerApi {
 
     final piResponse = response.asPiServerResponse<UnregisterContainerResult>();
     final errorResponse = piResponse?.asError;
-    if (errorResponse != null) throw errorResponse.piServerResultError;
+    if (errorResponse != null) {
+      if (errorResponse.piServerResultError.code == 3002) {
+        return UnregisterContainerResult(success: true);
+      }
+      throw errorResponse.piServerResultError;
+    }
     if (response.statusCode != 200 || piResponse == null) throw ResponseError(response);
 
     return piResponse.asSuccess!.resultValue;
diff --git a/lib/model/token_container.dart b/lib/model/token_container.dart
index d145dfb2..51961a13 100644
--- a/lib/model/token_container.dart
+++ b/lib/model/token_container.dart
@@ -188,9 +188,6 @@ class TokenContainer with _$TokenContainer {
       return null;
     }
 
-    Logger.warning('PublicServerKey: $publicServerKey'); // TODO: remove
-    Logger.warning('PublicClientKey: $publicClientKey'); // TODO: remove
-    Logger.warning('PrivateClientKey: $privateClientKey'); // TODO: remove
     return TokenContainerFinalized(
       issuer: issuer,
       nonce: nonce,
diff --git a/lib/widgets/dialog_widgets/add_container_progress_dialog.dart b/lib/widgets/dialog_widgets/add_container_progress_dialog.dart
index f142b930..50496782 100644
--- a/lib/widgets/dialog_widgets/add_container_progress_dialog.dart
+++ b/lib/widgets/dialog_widgets/add_container_progress_dialog.dart
@@ -52,15 +52,17 @@ class _AddContainerProgressDialogState extends State<AddContainerProgressDialog>
       title: Text(AppLocalizations.of(context)!.containerAddDialogTitle),
       content: SizedBox(
         width: double.maxFinite,
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            for (var serial in widget.serials) ...[
-              AddContainerProgressDialogTile(serial, _notifiers[serial]),
-              if (serial != widget.serials.last) const Divider(),
-            ]
-          ],
+        child: SingleChildScrollView(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              for (var serial in widget.serials) ...[
+                AddContainerProgressDialogTile(serial, _notifiers[serial]),
+                if (serial != widget.serials.last) const Divider(),
+              ]
+            ],
+          ),
         ),
       ),
       actions: [
diff --git a/test/unit_test/api/privacy_idea_container_api_test.dart b/test/unit_test/api/privacy_idea_container_api_test.dart
index aa6bbdcc..18d0b106 100644
--- a/test/unit_test/api/privacy_idea_container_api_test.dart
+++ b/test/unit_test/api/privacy_idea_container_api_test.dart
@@ -264,7 +264,7 @@ void _testPrivacyIdeaContainerApi() {
       });
       // Act
       print('');
-      final data = await containerApi.finalizeContainer(tokenContainer, EccUtils());
+      final data = await containerApi.finalizeContainer(tokenContainer);
       final policies = data.policies;
       final responsePublicServerKey = data.publicServerKey;
       // Assert