Minor mapping updates