diff --git a/src/wagtailmedia/static/wagtailmedia/js/media-chooser-modal.js b/src/wagtailmedia/static/wagtailmedia/js/media-chooser-modal.js
index 10fcc117..1be4a56c 100644
--- a/src/wagtailmedia/static/wagtailmedia/js/media-chooser-modal.js
+++ b/src/wagtailmedia/static/wagtailmedia/js/media-chooser-modal.js
@@ -126,7 +126,7 @@ MEDIA_CHOOSER_MODAL_ONLOAD_HANDLERS = {
                     dataType: 'text',
                     success: modal.loadResponseText,
                     error: function(response, textStatus, errorThrown) {
-                        message = jsonData['error_message'] + '<br />' + errorThrown + ' - ' + response.status;
+                        const message = jsonData['error_message'] + '<br />' + errorThrown + ' - ' + response.status;
                         $('#upload').append(
                             '<div class="help-block help-critical">' +
                             '<strong>' + jsonData['error_label'] + ': </strong>' + message + '</div>');
@@ -186,10 +186,7 @@ MEDIA_CHOOSER_MODAL_ONLOAD_HANDLERS = {
     },
     'select_format': function(modal) {
         $('form', modal.body).on('submit', function() {
-            var formdata = new FormData(this);
-
             $.post(this.action, $(this).serialize(), modal.loadResponseText, 'text');
-
             return false;
         });
     }
diff --git a/src/wagtailmedia/views/media.py b/src/wagtailmedia/views/media.py
index dfc0512d..22eea813 100644
--- a/src/wagtailmedia/views/media.py
+++ b/src/wagtailmedia/views/media.py
@@ -40,12 +40,12 @@ def index(request):
 
     # Filter by collection
     current_collection = None
-    collection_id = request.GET.get("collection_id")
-    if collection_id:
+    if collection_id := request.GET.get("collection_id"):
         try:
             current_collection = Collection.objects.get(id=collection_id)
             media = media.filter(collection=current_collection)
         except (ValueError, Collection.DoesNotExist):
+            # Ignore invalid or unknown collection_id
             pass
 
     # Search
diff --git a/src/wagtailmedia/wagtail_hooks.py b/src/wagtailmedia/wagtail_hooks.py
index e54a0034..1d3af8b5 100644
--- a/src/wagtailmedia/wagtail_hooks.py
+++ b/src/wagtailmedia/wagtail_hooks.py
@@ -93,8 +93,7 @@ def register_media_permissions_panel():
 
 @hooks.register("describe_collection_contents")
 def describe_collection_media(collection):
-    media_count = get_media_model().objects.filter(collection=collection).count()
-    if media_count:
+    if media_count := get_media_model().objects.filter(collection=collection).count():
         url = reverse("wagtailmedia:index") + f"?collection_id={collection.id}"
         return {
             "count": media_count,
@@ -104,6 +103,7 @@ def describe_collection_media(collection):
             % {"count": media_count},
             "url": url,
         }
+    return None
 
 
 class MediaAdminURLFinder(ModelAdminURLFinder):
diff --git a/tests/testapp/settings.py b/tests/testapp/settings.py
index 43a61a65..d6a2cba7 100644
--- a/tests/testapp/settings.py
+++ b/tests/testapp/settings.py
@@ -27,7 +27,6 @@
 ROOT_URLCONF = "testapp.urls"
 
 STATIC_URL = "/static/"
-STATIC_ROOT = STATIC_ROOT
 
 STATICFILES_FINDERS = ("django.contrib.staticfiles.finders.AppDirectoriesFinder",)
 
@@ -44,7 +43,6 @@
                 "django.template.context_processors.request",
                 "django.contrib.auth.context_processors.auth",
                 "django.contrib.messages.context_processors.messages",
-                "django.template.context_processors.request",
                 "wagtail.contrib.settings.context_processors.settings",
             ],
             "debug": True,