Template and date fixes