Fixes to module export.