diff --git a/doc/baselines.rst b/doc/baselines.rst
index 3ac5ddf0ef739ad1c0354d0c42a203fc8f070e67..765a7cfc2cf99f3ec762a8c28976d6de3e005e1c 100644
--- a/doc/baselines.rst
+++ b/doc/baselines.rst
@@ -21,7 +21,7 @@ To see the description of the command, you can type in the console:
 
    $ bob pad vanilla-pad --help
 
-This command is explained in more detail in :ref:`bob.pad.base`.
+This command is explained in more detail in :ref:`bob.pad.base <bob.pad.base.vanilla_pad_features>`.
 
 Usually, it is a good idea to have at least verbose level 2 (i.e., calling
 ``bob pad vanilla-pad --verbose --verbose``, or the short version
@@ -29,14 +29,14 @@ Usually, it is a good idea to have at least verbose level 2 (i.e., calling
 
 .. note:: **Running in Parallel**
 
-   To run the experiments in parallel, you can define a dask client
-   (multi-processing) configurations as explained in :ref:`running_in_parallel`.
+   To run the experiments in parallel, you can use an existing or (define a new)
+   SGE grid or local host multiprocessing configuration. To run the experiment
+   in the Idiap SGE grid, you can simply add the ``--dask-client sge`` command
+   line option. To run experiments in parallel on the local machine, add the 
+   ``--dask-client local-parallel`` option.
 
-   In short, to run in the Idiap SGE grid, you can simply add the ``-l``
-   (``--dask-client``) command line option, with grid configuration parameters
-   (e.g. ``-l sge``).
-   To run experiments in parallel on the local machine, simply add the
-   ``-l local-parallel`` option.
+   See :ref:`this <bob.bio.base.vanilla_biometrics_advanced_features>` for more
+   details on dask configurations.
 
 
 Database setups and baselines are encoded using
diff --git a/doc/other_pad_algorithms.rst b/doc/other_pad_algorithms.rst
index a23f4339a2859f5eb9d20d0bef6144a357801d58..7ab99dc4b3137976889fa56827829e9cf64f741a 100644
--- a/doc/other_pad_algorithms.rst
+++ b/doc/other_pad_algorithms.rst
@@ -30,20 +30,21 @@ To see the description of this command you can type in the console:
 
    $ bob pad --help
 
-This script is explained in more detail in :ref:`bob.pad.base.experiments`.
+This script is explained in more detail in :ref:`bob.pad.base`.
 
 Usually, it is a good idea to have at least verbose level 2 (i.e., calling
 ``bob pad --verbose --verbose``, or the short version ``bob pad -vv``).
 
 .. note:: **Running in Parallel**
 
-   To run the experiments in parallel, you can define an SGE grid or local host
-   (multi-processing) configurations as explained in
-   :ref:`running_in_parallel`.
+   To run the experiments in parallel, you can use an existing or (define a new)
+   SGE grid or local host multiprocessing configuration. To run the experiment
+   in the Idiap SGE grid, you can simply add the ``--dask-client sge`` command
+   line option. To run experiments in parallel on the local machine, add the 
+   ``--dask-client local-parallel`` option.
 
-   In short, to run in the Idiap SGE grid, you can simply add the
-   ``--dask-client sge`` command line option. To run experiments in parallel on
-   the local machine, simply add the ``--dask-client local-parallel`` option.
+   See :ref:`this <bob.bio.base.vanilla_biometrics_advanced_features>` for more
+   details on dask configurations.
 
 
 Database setups and face PAD algorithms are encoded using