Fix some PullReview advices