Merge branch '2022-06-16-assorted-bugfixes'

- A wide array of regression fixes and minor updates