diff --git a/bemani/backend/bishi/bishi.py b/bemani/backend/bishi/bishi.py
index 5858911..da305d3 100644
--- a/bemani/backend/bishi/bishi.py
+++ b/bemani/backend/bishi/bishi.py
@@ -3,11 +3,12 @@ import binascii
 import base64
 
 try:
-    # Python <= 3.9
-    from collections import Iterable
-except ImportError:
     # Python > 3.9
     from collections.abc import Iterable
+except ImportError:
+    # Python <= 3.9
+    from collections import Iterable  # type: ignore
+
 from typing import Any, Dict, List, Sequence, Union
 
 from bemani.backend.bishi.base import BishiBashiBase
diff --git a/bemani/backend/jubeat/base.py b/bemani/backend/jubeat/base.py
index 396e074..69a590d 100644
--- a/bemani/backend/jubeat/base.py
+++ b/bemani/backend/jubeat/base.py
@@ -182,6 +182,7 @@ class JubeatBase(CoreHandler, CardManagerHandler, PASELIHandler, Base):
             # if this returns None anyway.
             scores = self.cache.get(cache_key) or []
 
+        rest: List[Score]
         if len(scores) < 50:
             # We simply return the whole amount for this, and cache nothing.
             rest = []
diff --git a/bemani/format/afp/container.py b/bemani/format/afp/container.py
index 7b47063..a37c3df 100644
--- a/bemani/format/afp/container.py
+++ b/bemani/format/afp/container.py
@@ -1371,8 +1371,7 @@ class TXP2File(TrackedCoverage, VerboseOutput):
                     raise Exception("Cannot update texture with different size!")
 
                 # Now, get the raw image data, and let the TDXT container refresh the raw.
-                img = img.convert("RGBA")
-                texture.img = img
+                texture.img = img.convert("RGBA")
 
                 return
         else: