Move closer to correct handling.
Fix map drawing path.