[#52] Two small template tweaks