[#1007] More template tweaks