Small templates fixing