[#2] Small tweaks to templates