Small fixes in template