Fixes to documentation generation