Fix more template files.