Merge branch '2023-09-28-assorted-minor-fixes'