a few template fixes