Changes and corrections for the pull request