Fixes for map functions #61