diff --git a/README.rst b/README.rst
index b2a74de3..4205584d 100644
--- a/README.rst
+++ b/README.rst
@@ -89,7 +89,7 @@ The intention is that this driver follows the OpenStack Nova model.
 
 The driver is being promoted into the nova core project in stages, the first of
 which is represented by blueprint `powervm-nova-compute-driver`_.  The
-coexistence of these two incarnations of the driver raises some `Dual Driver
+coexistence of these two incarnations of the driver raises some `Upgrade
 Considerations`_.
 
 .. _`powervm-nova-compute-driver`: https://blueprints.launchpad.net/nova/+spec/powervm-nova-compute-driver
diff --git a/doc/ext/support_matrix.py b/doc/ext/support_matrix.py
index 18b25265..11ea67b2 100644
--- a/doc/ext/support_matrix.py
+++ b/doc/ext/support_matrix.py
@@ -320,7 +320,7 @@ class SupportMatrixDirective(rst.Directive):
 
         # then one column for each hypervisor driver
         impls = matrix.targets.keys()
-        impls.sort()
+        sorted(impls)
         for key in impls:
             target = matrix.targets[key]
             implcol = nodes.entry()
@@ -353,7 +353,7 @@ class SupportMatrixDirective(rst.Directive):
 
             # and then one column for each hypervisor driver
             impls = matrix.targets.keys()
-            impls.sort()
+            sorted(impls)
             for key in impls:
                 target = matrix.targets[key]
                 impl = feature.implementations[key]
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 4a7d7c0f..0e25f555 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -11,9 +11,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import subprocess
-import sys
 import os
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -143,11 +142,7 @@ pygments_style = 'sphinx'
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local",
-          "-n1"]
-html_last_updated_fmt = subprocess.Popen(
-    git_cmd, stdout=subprocess.PIPE).communicate()[0]
+html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.