Merge branch '2021-01-04-minor-fixes'

- Assorted fixes