Several small fixes.

Ah, good point.  I had this before the refactor to Client and it got dropped.  Fixed.