map fixes after merge