Merge branch '2024-05-29-assorted-small-fixes'