Minor templates update