diff --git a/app/src/processing/app/debug/BasicUploader.java b/app/src/processing/app/debug/BasicUploader.java
index 9db3ffa1e..8fdab047e 100644
--- a/app/src/processing/app/debug/BasicUploader.java
+++ b/app/src/processing/app/debug/BasicUploader.java
@@ -198,7 +198,7 @@ public class BasicUploader extends Uploader  {
     
     // Something happened while detecting port
     throw new RunnerException(
-        _("Couldn’t find a Leonardo on the selected port. Check that you have the correct port selected.  If it is correct, try pressing the board's reset button after initiating the upload."));
+        _("Couldn't find a Board on the selected port. Check that you have the correct port selected.  If it is correct, try pressing the board's reset button after initiating the upload."));
   }
 
   public boolean uploadUsingProgrammer(String buildPath, String className)
diff --git a/hardware/arduino/sam/cores/arduino/USB/CDC.cpp b/hardware/arduino/sam/cores/arduino/USB/CDC.cpp
index 40714c9ab..615d2a2c3 100644
--- a/hardware/arduino/sam/cores/arduino/USB/CDC.cpp
+++ b/hardware/arduino/sam/cores/arduino/USB/CDC.cpp
@@ -252,6 +252,10 @@ size_t Serial_::write(uint8_t c) {
 // where the port is configured (lineState != 0) but not quite opened.
 Serial_::operator bool()
 {
+	// this is here to avoid spurious opening after upload
+	if (millis() < 500)
+		return false;
+
 	bool result = false;
 
 	if (_usbLineInfo.lineState > 0)
diff --git a/libraries/SD/examples/CardInfo/CardInfo.ino b/libraries/SD/examples/CardInfo/CardInfo.ino
index 0c2dfc5e2..02673c072 100644
--- a/libraries/SD/examples/CardInfo/CardInfo.ino
+++ b/libraries/SD/examples/CardInfo/CardInfo.ino
@@ -20,6 +20,7 @@
  by Tom Igoe
  */
  // include the SD library:
+#include <SPI.h>
 #include <SD.h>
 
 // set up variables using the SD utility library functions:
diff --git a/libraries/SD/examples/Datalogger/Datalogger.ino b/libraries/SD/examples/Datalogger/Datalogger.ino
index a7f85eeaf..30a010e51 100644
--- a/libraries/SD/examples/Datalogger/Datalogger.ino
+++ b/libraries/SD/examples/Datalogger/Datalogger.ino
@@ -20,6 +20,7 @@
  	 
  */
 
+#include <SPI.h>
 #include <SD.h>
 
 // On the Ethernet Shield, CS is pin 4. Note that even if it's not
diff --git a/libraries/SD/examples/DumpFile/DumpFile.ino b/libraries/SD/examples/DumpFile/DumpFile.ino
index d83089af6..b58d50e2b 100644
--- a/libraries/SD/examples/DumpFile/DumpFile.ino
+++ b/libraries/SD/examples/DumpFile/DumpFile.ino
@@ -20,6 +20,7 @@
  	 
  */
 
+#include <SPI.h>
 #include <SD.h>
 
 // On the Ethernet Shield, CS is pin 4. Note that even if it's not
diff --git a/libraries/SD/examples/Files/Files.ino b/libraries/SD/examples/Files/Files.ino
index a15b8626d..dc172d23a 100644
--- a/libraries/SD/examples/Files/Files.ino
+++ b/libraries/SD/examples/Files/Files.ino
@@ -17,6 +17,7 @@
  This example code is in the public domain.
  	 
  */
+#include <SPI.h>
 #include <SD.h>
 
 File myFile;
diff --git a/libraries/SD/examples/ReadWrite/ReadWrite.ino b/libraries/SD/examples/ReadWrite/ReadWrite.ino
index 5805fc8d6..12537c8fe 100644
--- a/libraries/SD/examples/ReadWrite/ReadWrite.ino
+++ b/libraries/SD/examples/ReadWrite/ReadWrite.ino
@@ -18,6 +18,7 @@
  	 
  */
  
+#include <SPI.h>
 #include <SD.h>
 
 File myFile;
diff --git a/libraries/SD/examples/listfiles/listfiles.ino b/libraries/SD/examples/listfiles/listfiles.ino
index 876c3f865..07a480d8e 100644
--- a/libraries/SD/examples/listfiles/listfiles.ino
+++ b/libraries/SD/examples/listfiles/listfiles.ino
@@ -17,6 +17,7 @@
  This example code is in the public domain.
  	 
  */
+#include <SPI.h>
 #include <SD.h>
 
 File root;