Small updates of template