diff --git a/__pkginfo__.py b/__pkginfo__.py
index f3fb35f6..d9568108 100644
--- a/__pkginfo__.py
+++ b/__pkginfo__.py
@@ -57,7 +57,7 @@ entry_points       = {
     ]}
 ftp_url            = None
 install_requires   = ['spark-parser >= 1.8.5, < 1.9.0',
-                      'xdis >= 3.8.2, < 3.9.0']
+                      'xdis >= 3.8.4, < 3.9.0']
 
 license            = 'GPL3'
 mailing_list       = 'python-debugger@googlegroups.com'
diff --git a/admin-tools/check-newer-versions.sh b/admin-tools/check-newer-versions.sh
index 1c2d18d4..bcb9608e 100755
--- a/admin-tools/check-newer-versions.sh
+++ b/admin-tools/check-newer-versions.sh
@@ -16,6 +16,7 @@ if ! source ./setup-master.sh ; then
 fi
 cd ..
 for version in $PYVERSIONS; do
+    echo --- $version ---
     if ! pyenv local $version ; then
 	exit $?
     fi
@@ -23,4 +24,5 @@ for version in $PYVERSIONS; do
     if ! make check; then
 	exit $?
     fi
+    echo === $version ===
 done
diff --git a/admin-tools/check-older-versions.sh b/admin-tools/check-older-versions.sh
index 0bfb93fb..603c7920 100755
--- a/admin-tools/check-older-versions.sh
+++ b/admin-tools/check-older-versions.sh
@@ -15,6 +15,7 @@ fi
 
 cd ..
 for version in $PYVERSIONS; do
+    echo --- $version ---
     if ! pyenv local $version ; then
 	exit $?
     fi
@@ -22,4 +23,5 @@ for version in $PYVERSIONS; do
     if ! make check ; then
 	exit $?
     fi
+    echo === $version ===
 done
diff --git a/uncompyle6/scanner.py b/uncompyle6/scanner.py
index 7c93f468..7b85eed8 100755
--- a/uncompyle6/scanner.py
+++ b/uncompyle6/scanner.py
@@ -504,12 +504,15 @@ def get_scanner(version, is_pypy=False, show_asm=None):
     if version in PYTHON_VERSIONS:
         v_str = "%s" % (int(version * 10))
         if PYTHON3:
-            import importlib
-            if is_pypy:
-                scan = importlib.import_module("uncompyle6.scanners.pypy%s" % v_str)
+            if version == 3.0:
+                import uncompyle6.scanners.scanner30 as scan
             else:
-                scan = importlib.import_module("uncompyle6.scanners.scanner%s" % v_str)
-            if False: print(scan)  # Avoid unused scan
+                import importlib
+                if is_pypy:
+                    scan = importlib.import_module("uncompyle6.scanners.pypy%s" % v_str)
+                else:
+                    scan = importlib.import_module("uncompyle6.scanners.scanner%s" % v_str)
+                if False: print(scan)  # Avoid unused scan
         else:
             if is_pypy:
                 exec("import uncompyle6.scanners.pypy%s as scan" % v_str)