Minor fixes in template