Fix a few template references