[OE-2621 minor enhancements to the module api