diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
index fdc6aca781..958e6bda4c 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
@@ -34,7 +34,7 @@ public final class ModuleInfo {
 		}
 	}
 
-	public String modulepath = null;
+	public final String modulepath;
 	
 	public String outputpath = null;
 	
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
index d55cf6e893..cf1cabe22a 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
@@ -35,7 +35,11 @@ public final class ModuleReader {
 			ModuleInfo.ui.println("No INF nor MSA file found!");
 			System.exit(0);
 		} else {
-			filename = ModuleInfo.ui.choose("Found .inf or .msa file for module\n" + mi.modulepath + "\nChoose one Please", mi.msaorinf.toArray());
+			if (mi.msaorinf.size() == 1) {
+				filename = (String)mi.msaorinf.toArray()[0];
+			} else {
+				filename = ModuleInfo.ui.choose("Found .inf or .msa file for module\n" + mi.modulepath + "\nChoose one Please", mi.msaorinf.toArray());
+			}
 		}
 		if (filename.contains(".inf")) {
 			readInf(filename);
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
index 7d4c13ba96..7d9859c815 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
@@ -44,9 +44,12 @@ public final class SourceFileReplacer {
 		
 		String outname = null;
 		String inname = null;
+		/*
 		if (ModuleInfo.ui.yesOrNo("Changes will be made to the Source Code.  View details?")) {
 			showdetails = true;
 		}
+		*/
+		showdetails = true;			// set this as default now, may be changed in the future
 		
 		Iterator<String> di = mi.localmodulesources.iterator();
 		while (di.hasNext()) {