Merge branch '2024-02-06-assorted-fixes'

A number of assorted fixes