Prelaunch cleanup

Miscellaneous fixes, see commits for details. As usual, I'll keep adding to this, but I want to make some of these cosmetic fixes available ASAP.