small fixes for map and type deduction semantics