fixes for modules #2