Last minute fixes

It's possible this shouldn't be committed, but I need to wipe this
computer and don't want to lose anything important.