fix up templates for PR #727