Updates due to comments for the pull request comments