diff --git a/.development/pyboard_util.py b/.development/pyboard_util.py
index 9ae4faf..e3abcd5 100644
--- a/.development/pyboard_util.py
+++ b/.development/pyboard_util.py
@@ -29,6 +29,10 @@ def stop_badge(args, verbose):
     pyb = get_pyb(args)
     print("Stopping running app:", end="", flush=True)
     write_command(pyb, b'\r\x03\x03') # ctrl-C twice: interrupt any running program
+    n = pyb.serial.inWaiting()
+    while n > 0:
+        pyb.serial.read(n)
+        n = pyb.serial.inWaiting()
     print(" DONE")
 
 def write_command(pyb, command):
diff --git a/boot.py b/boot.py
index e319cdc..70b8568 100644
--- a/boot.py
+++ b/boot.py
@@ -30,6 +30,8 @@ else:
     if "main.py" in root:
         start = "main.py"
     start = start or file("once.txt", True) or file("default_app.txt", False) or any_home() or "bootstrap.py"
+    if ".py" not in start:
+        start += "/main.py"
     print("Booting into %s" % start)
     tilda.main(start)