fix minor template issues