Fix to templates + templatified AR
Merge of template changes