Fix up the template a bit