Merge branch '2020-12-02-master-imports'

- Assorted minor fixes