More rebase fixes to Template and Config