Fix more template references that have changed...