diff --git a/bob/pad/base/algorithm/__init__.py b/bob/pad/base/algorithm/__init__.py
index 64da3beacb7e6b8b9cebc37df1db16e86336ac5e..e0721d16b4e36f5fda14e623484e8346c4aad26d 100644
--- a/bob/pad/base/algorithm/__init__.py
+++ b/bob/pad/base/algorithm/__init__.py
@@ -1,4 +1,6 @@
 from .Algorithm import Algorithm
 
+# to fix sphinx warnings of not able to find classes, when path is shortened
+Algorithm.__module__ = "bob.pad.base.algorithm"
 # gets sphinx autodoc done right - don't remove it
 __all__ = [_ for _ in dir() if not _.startswith('_')]
diff --git a/bob/pad/base/database/__init__.py b/bob/pad/base/database/__init__.py
index cc025f517686c134e634aa819a3125949439a586..b310f8abf59daa121625e2f4c5e599a63f894b53 100644
--- a/bob/pad/base/database/__init__.py
+++ b/bob/pad/base/database/__init__.py
@@ -2,7 +2,7 @@ from .database import PadDatabase
 from .file import PadFile
 
 # to fix sphinx warnings of not able to find classes, when path is shortened
-PadDatabase.__module__ = "database"
-PadFile.__module__ = "database"
+PadDatabase.__module__ = "bob.pad.base.database"
+PadFile.__module__ = "bob.pad.base.database"
 # gets sphinx autodoc done right - don't remove it
 __all__ = [_ for _ in dir() if not _.startswith('_')]
diff --git a/doc/extra-intersphinx.txt b/doc/extra-intersphinx.txt
index 084964fbdeb2841a4c24505bad3eb83d86e9daf1..4923eada34c5fbf0d119b5319ff9178ad7c1a4ff 100644
--- a/doc/extra-intersphinx.txt
+++ b/doc/extra-intersphinx.txt
@@ -3,5 +3,4 @@ numpy
 bob.bio.spear
 gridtk
 bob.db.base
-bob.db.avspoof
-bob.pad.voice
\ No newline at end of file
+bob.db.avspoof
\ No newline at end of file
diff --git a/doc/implementation.rst b/doc/implementation.rst
index 1e487a3476a9c1df159915e9d563eee6c2ba0f0f..155ea1231d8a5b3e0c207a5c7416cf53a054e68b 100644
--- a/doc/implementation.rst
+++ b/doc/implementation.rst
@@ -93,7 +93,7 @@ Implemented Tools
 Example implementations of the base classes can be found in all of the ``bob.pad`` packages.
 Here is the current list of implementations:
 
-* :ref:`bob.pad.voice <bob.pad.voice>` : :ref:`bob.pad.voice`
+* `bob.pad.voice`
 
 
 .. todo:: complete this list, once the other packages are documented as well.
diff --git a/doc/installation.rst b/doc/installation.rst
index a358a40be78eb2415acbc31aa627ef433422ae9d..91816a03417b9d38bd584f47b9fa62abbf6ea2fe 100644
--- a/doc/installation.rst
+++ b/doc/installation.rst
@@ -63,7 +63,7 @@ Please use ``./bin/databases.py`` for a list of known databases, where you can s
 
 
 .. note::
-   If you have installed only ``bob.pad.base``, there is no database listed -- as all databases are included in other extension packages, such as :ref:`bob.pad.voice <bob.pad.voice>`.
+   If you have installed only ``bob.pad.base``, there is no database listed -- as all databases are included in other extension packages, such as `bob.pad.voice`.
 
 
 Test your Installation