Some template tweaks.