diff --git a/doc/src/custom/make-commands.sh b/doc/src/custom/make-commands.sh
index 23df2049dbd..e2b81b05d3e 100755
--- a/doc/src/custom/make-commands.sh
+++ b/doc/src/custom/make-commands.sh
@@ -45,11 +45,11 @@ END
 for CAT in $($CYLC categories); do
 	cat >> "$COMMAND_REF_FILE" <<END
 
+.. _command-cat-${CAT}:
+
 ${CAT}
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. _command-cat-${CAT}:
-
 .. code-block:: none
 
    $("$CYLC" "$CAT" --help | awk '{print "   " $0}')
@@ -68,11 +68,11 @@ END
 for COM in $($CYLC commands); do
 	cat >> "$COMMAND_REF_FILE" <<END
 
+.. _command-${COM}:
+
 ${COM}
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. _command-${COM}:
-
 .. code-block:: none
 
    $("$CYLC" "$COM" --help  | awk '{print "   " $0}')
diff --git a/doc/src/installation.rst b/doc/src/installation.rst
index c515ed0e88e..20ce59ab13a 100644
--- a/doc/src/installation.rst
+++ b/doc/src/installation.rst
@@ -177,7 +177,7 @@ environment.
 .. _RTAST:
 
 Automated Tests
-^^^^^^^^^^^^^^^
+---------------
 
 For development purposes there are four sets of tests:
 
diff --git a/doc/src/suite-config.rst b/doc/src/suite-config.rst
index 2416dadcd62..9788ded757d 100644
--- a/doc/src/suite-config.rst
+++ b/doc/src/suite-config.rst
@@ -2486,7 +2486,7 @@ See :ref:`SuiteRCReference` for details.
 .. _Parameterized Tasks Label:
 
 Parameterized Tasks
-^^^^^^^^^^^^^^^^^^^
+-------------------
 
 Cylc can automatically generate tasks and dependencies by expanding
 parameterized task names over lists of parameter values. Uses for this
@@ -3592,7 +3592,7 @@ For better clarity and disambiguation Python modules can be prefixed with
 .. _EmPylabel:
 
 EmPy
-^^^^
+----
 
 In addition to Jinja2, Cylc supports EmPy template processor in suite
 configurations. Similarly to Jinja2, EmPy provides variables, mathematical
@@ -3647,7 +3647,7 @@ reasons:
 
 
 Omitting Tasks At Runtime
-^^^^^^^^^^^^^^^^^^^^^^^^^
+-------------------------
 
 It is sometimes convenient to omit certain tasks from the suite at
 runtime without actually deleting their definitions from the suite.