Dyer: copy/paste template: fixes