also fix templates