A few minor fixes to the previous pull request

This pull request fixes a few minor errors in the preceding request.