several small enhancements in the cross-platform client units
(no functional modification)