[CHORE] Fixes minor map issues