diff --git a/pkg/cibot/lgtm.go b/pkg/cibot/lgtm.go
index 308a53817342731d3c3377bb142ed70a039172fd..b677aa577138b98d2659fee78de3d05ae506091b 100644
--- a/pkg/cibot/lgtm.go
+++ b/pkg/cibot/lgtm.go
@@ -13,7 +13,7 @@ import (
 const (
 	lgtmSelfOwnMessage = `Sorry, you cannot add ***lgtm*** to the pull request you created. :astonished:`
 	lgtmAddedMessage   = `***lgtm*** was added to this pull request by: ***%s***. :wave:
-**NOTE:**: If this pull request is not merged while all conditions are met, comment "/check-pr" to try again. :smile: `
+**NOTE:** If this pull request is not merged while all conditions are met, comment "/check-pr" to try again. :smile: `
 	lgtmRemovedMessage         = `***lgtm*** is removed in this pull request by: ***%s***. :flushed: `
 	lgtmAddNoPermissionMessage = `Thanks for your review, ***%s***, your opinion is very important to us.:wave:
 The maintainers will consider your advice carefully.`
diff --git a/pkg/cibot/ownerhandler.go b/pkg/cibot/ownerhandler.go
index 8602f548aa0f8a46c225c281b5efec720f901103..4d57d6b525db5b86d654f82c75e3ecd84adf5ad6 100644
--- a/pkg/cibot/ownerhandler.go
+++ b/pkg/cibot/ownerhandler.go
@@ -193,14 +193,21 @@ func (handler *OwnerHandler) removeOwners(repo database.Repositories, expectedMe
 		glog.Infof("list of remove privileges: %v", listOfRemove)
 		memberbody := &gitee.DeleteV5ReposOwnerRepoCollaboratorsUsernameOpts{}
 		memberbody.AccessToken = optional.NewString(handler.Config.GiteeToken)
+		checkBody := &gitee.GetV5ReposOwnerRepoCollaboratorsUsernameOpts{}
+		checkBody.AccessToken = optional.NewString(handler.Config.GiteeToken)
 
 		glog.Infof("begin to remove privileges for %s/%s", repo.Owner, repo.Repo)
 		for _, v := range listOfRemove {
-			_, err := handler.GiteeClient.RepositoriesApi.DeleteV5ReposOwnerRepoCollaboratorsUsername(
-				handler.Context, repo.Owner, repo.Repo, v, memberbody)
+			_,err := handler.GiteeClient.RepositoriesApi.GetV5ReposOwnerRepoCollaboratorsUsername(handler.Context, repo.Owner, repo.Repo, v, checkBody)
 			if err != nil {
-				glog.Errorf("fail to remove privileges: %v", err)
-				continue
+				glog.Infof("%s is not in %s/%s", v, repo.Owner, repo.Repo)
+			}else{
+				_, err = handler.GiteeClient.RepositoriesApi.DeleteV5ReposOwnerRepoCollaboratorsUsername(
+					handler.Context, repo.Owner, repo.Repo, v, memberbody)
+				if err != nil {
+					glog.Errorf("fail to remove privileges: %v", err)
+					continue
+				}
 			}
 
 			// remove from DB
diff --git a/pkg/cibot/pullrequest.go b/pkg/cibot/pullrequest.go
index cfa30fd97bb29c078a0d24ecd820afa250a5e6c2..4c0596ddf8615f638c555ad1aa128f14689b9d9d 100644
--- a/pkg/cibot/pullrequest.go
+++ b/pkg/cibot/pullrequest.go
@@ -61,7 +61,7 @@ func (s *Server) HandlePullRequestEvent(actionDesc string, event *gitee.PullRequ
 		var committors []string
 		if len(ps) > 0 {
 			for _, p := range ps {
-				if len(committors) < 10 {
+				if len(committors) < 20 {
 					committors = append(committors, fmt.Sprintf("***@%s***", p.User))
 				}
 			}
@@ -224,7 +224,7 @@ func (s *Server) UpdateLabelsBySourceBranchChange(delLabels, updateLabels []stri
 	body.AccessToken = optional.NewString(s.Config.GiteeToken)
 	glog.Infof("invoke api to remove labels: %v", strLabel)
 	//update pr
-	for _, dellalbe := range strDelLabel {
+	for _, dellalbe := range delLabels {
 		response, err := s.GiteeClient.PullRequestsApi.DeleteV5ReposOwnerRepoPullsLabel(s.Context, owner, repo, prNumber, dellalbe, &body)
 		if err != nil {
 			if response != nil && response.StatusCode == 400 {
@@ -242,7 +242,7 @@ func (s *Server) UpdateLabelsBySourceBranchChange(delLabels, updateLabels []stri
 	cBody := gitee.PullRequestCommentPostParam{}
 	cBody.AccessToken = s.Config.GiteeToken
 	cBody.Body = fmt.Sprintf(commentContent, strDelLabel, s.Config.BotName)
-	_, _, err = s.GiteeClient.PullRequestsApi.PostV5ReposOwnerRepoPullsNumberComments(s.Context, owner, repo, prNumber, cBody)
+	_, _, err := s.GiteeClient.PullRequestsApi.PostV5ReposOwnerRepoPullsNumberComments(s.Context, owner, repo, prNumber, cBody)
 	if err != nil {
 		glog.Errorf("unable to add comment in pull request: %v", err)
 		return err