fixes for modules