more fixes on migration tool version handling
more fixes on migration tool version handling