More tweaks of map functions.