More fixes for modules