small template fixes