Small changes in module manager