More fixes to documentation generation