Fixes for modules with mutliple inputs