Fixes in templates