Tiny changes in the map functions