Improvements to module management.