Fixes for getting documentation generation to work (STOX-16)