Fixes for documentation build

Changes introduced in issue #45 caused some build problems, that need to be fixed:
- Debian build break
- Parallel build break (make -j)