Fix mapping managers