Followup fixes to widget template migration