Fixed, slightly, the template stuff.  They complete now, which is good