I was overzealous with some of those templates...
More fixes.