Merge branch '2021-08-04-assorted-minor-fixes'

- Assorted fixes