Minor fixes

First commit for what will become v7.1.01, which will consist of minor
bug fixes. 3 fixes so far.