[default template] Small changes