Minor changes for modules