Few mapping adjustments