V2.1 dev 2nd attempt

Three straightforward changes from my last pull request.  I'll send the others in separate pull requests, since they may require a few moments thought.