Fixes in new templates.