Fixing issues with the new templates.