More template tweaks