Fix some#map