Bug fixes for ATC on map...