Merge branch '2022-04-12-two-more-fixes'