Fix templates after wrong merge ...