More minor template tweaks