issue #751 - last tweaks following live-testing