A series of small fixes

Sean --

I re-opened this same patcheset as a new pull request so that it could be against a topic branch in my git report (vs. against my master).