BM: map fixes