Fixes to template for doc generation