Mapping tweaks