Merge branch '2022-09-29-assorted-fixes'

- Assorted fixes we want to include before the release.