Minor template tweaks.