diff --git a/python-import/plugins.py b/python-import/plugins.py
index 72cb3376b9..7e3d18b073 100644
--- a/python-import/plugins.py
+++ b/python-import/plugins.py
@@ -45,7 +45,7 @@ def _import(package, plugin):
 
 def _import_all(package):
     """Import all plugins in a package"""
-    files = resources.contents(package)
+    files = [path.name for path in resources.files(package).iterdir()]
     plugins = [f[:-3] for f in files if f.endswith(".py") and f[0] != "_"]
     for plugin in plugins:
         _import(package, plugin)
diff --git a/python-import/population_quiz/population_quiz.py b/python-import/population_quiz/population_quiz.py
index ddea1252a1..f38190ef12 100644
--- a/python-import/population_quiz/population_quiz.py
+++ b/python-import/population_quiz/population_quiz.py
@@ -37,7 +37,7 @@ def run_quiz(population, num_questions, num_countries):
     num_correct = 0
     for q_num in range(num_questions):
         print(f"\n\nQuestion {q_num + 1}:")
-        countries = random.sample(population.keys(), num_countries)
+        countries = random.sample(list(population), num_countries)
         print("\n".join(f"{i}. {a}" for i, a in enumerate(countries, start=1)))
 
         # Get user input