Fixes to module runner