Two changes in one pull request

as per request.  Couldn't see how to split this into two pull requests.