Tweak a few mapping things.