Merge branch '2021-09-24-assorted-updates' into next

- A few minor updates