Minor mapping tweaks.