Module Manager Manager fixes