diff --git a/tools/DOI/authors.py b/tools/DOI/authors.py
index 3bbbff91a1e0eb887e72cdeffc53446b214e2601..4a0ec2489d8e99beb2800b1c3d08d3ddeb7d9111 100644
--- a/tools/DOI/authors.py
+++ b/tools/DOI/authors.py
@@ -119,6 +119,7 @@ _translations = {
     'Michael Hart'            : 'Hart, Michael',
     'Lamar Moore'             : 'Moore, Lamar',
     'LamarMoore'              : 'Moore, Lamar',
+    'Moore'                   : 'Moore, Lamar',
     'Tom Perkins'             : 'Perkins, Tom',
     'Jan Burle'               : 'Burle, Jan',
     'Duc Le'                  : 'Le, Duc'
diff --git a/tools/DOI/doi.py b/tools/DOI/doi.py
index 6bb60ee216176f9c127e58f0912435f1f320b314..ab8f28a9143e483ba1a2582bf73dc5b554853296 100644
--- a/tools/DOI/doi.py
+++ b/tools/DOI/doi.py
@@ -352,8 +352,14 @@ def get_urls_for_doi(version_str,  shortened_version_str,
             else:
                 prev_destination = sphinx_rel_notes_url.format('nightly', 'v'+ prev_version_str)
         elif minor == 6:
-            destination = sphinx_rel_notes_url.format('nightly', 'v'+ version_str)
-            prev_destination = sphinx_rel_notes_url.format('nightly', 'v'+ prev_version_str)
+            if patch >= 1:
+                destination = sphinx_rel_notes_url.format('v' + version_str, 'v'+ version_str)
+            else:
+                destination = sphinx_rel_notes_url.format('nightly', 'v'+ version_str)
+            if patch >= 2:
+                prev_destination = sphinx_rel_notes_url.format('v' + prev_version_str, 'v'+ prev_version_str)
+            else:
+                prev_destination = sphinx_rel_notes_url.format('nightly', 'v'+ prev_version_str)
         else:
             destination = wiki_rel_notes_url.format(shortened_version_str)
             prev_destination = wiki_rel_notes_url.format(shortened_prev_version_str)