Resolving issues from the pull request