Fix signature of map-related functions