Small template tweaks.