Fixes in template