Minor breaking templates update