Three minor things as per requested.