Minor templates editing.