Small changes to module generator