These are 6 commits of random things I found while doing the bullseye upgrade. Details in the commit messages.