Merge branch '2021-07-28-assorted-fixes'

- Assorted bugfixes