minor tweaks to ModuleManager.