Minor ModuleManager changes