Merge branch '2020-09-16-assorted-fixes'

- Assorted bug fixes