WIP: Various small fixes for 2.0 release

Potpourri!
I wouldn't call two "a few" :)