diff --git a/doc/source/conf.py b/doc/source/conf.py
index a2a82490535..7748ad226cd 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -264,7 +264,7 @@ _config_generator_config_files = [
 ]
 
 
-def _get_config_generator_config_definition(config_file):
+def _get_config_generator_config_definition(conf):
     config_file_path = '../../etc/oslo-config-generator/%s' % conf
     # oslo_config.sphinxconfiggen appends '.conf.sample' to the filename,
     # strip file extentension (.conf or .ini).
diff --git a/doc/source/ext/support_matrix.py b/doc/source/ext/support_matrix.py
index b56714d6712..c81d55a977f 100644
--- a/doc/source/ext/support_matrix.py
+++ b/doc/source/ext/support_matrix.py
@@ -284,7 +284,7 @@ class SupportMatrixDirective(rst.Directive):
 
         # then one column for each backend driver
         impls = matrix.targets.keys()
-        impls.sort()
+        impls = sorted(impls)
         for key in impls:
             target = matrix.targets[key]
             implcol = nodes.entry()
@@ -324,7 +324,7 @@ class SupportMatrixDirective(rst.Directive):
 
             # and then one column for each backend driver
             impls = matrix.targets.keys()
-            impls.sort()
+            impls = sorted(impls)
             for key in impls:
                 target = matrix.targets[key]
                 impl = feature.implementations[key]