[template] Minor updates