Geo Dataset to RS migration fixes