fixes in templates