Pipeline fixes for 0.2.2

These are some commits cherry-picked from main to apply on the 0.2.2 branch, in the hopes of getting something going for production.

By cherry-pick, I used this instead of the usual method:

git diff -c d7810e645cf68498c04831b6e5766bf09f47ebd5^ d7810e645cf68498c04831b6e5766bf09f47ebd5 | patch -p1

This gives us only the changes in that commit, not the totality of differences between the current branch and that commit, which would bring along a bunch of new work that we don't want in this branch.