Few changes on map/etc.