a few small template fixes