Fix map() and dotify()