MRG: a couple of small cleanup fixes

Getting ready for release.