Merge "Adjust to MapInfo to new api."