map fixes 1.2 final