small fixes

Assorted small fixes.