Fixes to module exports