Map improvements.