Fix up templates and date attributeS