Fixes in templates.