map fixes!