Small template tweaks