upstream fixes, template regeneration