Few template tweaks.