Fixing up templates.