Minor changes to module initialization