Fixup initial templates to have recipient vars