Small templates fix