Merge branch '2021-09-14-assorted-fixes'

- Assorted bugfixes