Fix up the templates some