Updates for the pull request issues