Fix old template stuff