Some minor changes to module