Merge branch '2020-08-05-misc-fixes'

- A large number of assorted fixes and minor improvements