Further improvements after migration to asciidoc