Minor template tweaks