Minor mapping changes for MOD