Minor fixes in tenplates