Fix up injection after template changes