WIP: Misc minor changes

(don't merge)