As found on prod: various small enhancements.
paul