Fix things in Map