Merge branch '2022-02-28-bugfixes'

- Assorted bugfixes