diff --git a/Tools/ArdupilotMegaPlanner/MAVLink.cs b/Tools/ArdupilotMegaPlanner/MAVLink.cs
index e24df86b53..eb03f48600 100644
--- a/Tools/ArdupilotMegaPlanner/MAVLink.cs
+++ b/Tools/ArdupilotMegaPlanner/MAVLink.cs
@@ -1865,7 +1865,7 @@ namespace ArdupilotMega
             int readcount = 0;
             lastbad = new byte[2];
 
-            BaseStream.ReadTimeout = 100;
+            BaseStream.ReadTimeout = 500; // 500 ms between chars
 
             DateTime start = DateTime.Now;
 
diff --git a/Tools/ArdupilotMegaPlanner/MainV2.cs b/Tools/ArdupilotMegaPlanner/MainV2.cs
index a0a75f0e8f..ba8bc897a9 100644
--- a/Tools/ArdupilotMegaPlanner/MainV2.cs
+++ b/Tools/ArdupilotMegaPlanner/MainV2.cs
@@ -257,6 +257,11 @@ namespace ArdupilotMega
 
             string[] ports = SerialPort.GetPortNames();
 
+            for (int a = 0; a < ports.Length; a++)
+            {
+                ports[a] = ports[a].TrimEnd();
+            }
+
             string[] all = new string[devs.Length + ports.Length];
 
             devs.CopyTo(all, 0);
diff --git a/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.pdb b/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.pdb
index 9be6fd68a9..1dad1a88d5 100644
Binary files a/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.pdb and b/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.pdb differ