Further template tweaks