Minor modifications to templates