Corrections in preparation of the pull request.