Thse four small fixes/improvements have been generated as the result
of my buster work.  They are not really related to buster.

Many more changes will follow...