Corrections to first pull request