Minor templates improvements