WIP: Various small fixes for 2.0 release

Potpourri!