Solved some issues from PullRequest