Minor fixes in ModuleRegistry