diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/src/org/eclipse/cdt/arduino/core/tests/FullIntegration.java b/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/src/org/eclipse/cdt/arduino/core/tests/FullIntegration.java
index fe2e51a3c7d..9e963be93a6 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/src/org/eclipse/cdt/arduino/core/tests/FullIntegration.java
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/src/org/eclipse/cdt/arduino/core/tests/FullIntegration.java
@@ -65,7 +65,9 @@ public class FullIntegration {
 	private static void setPreferences() throws Exception {
 		URL[] urls = new URL[] { new URL("http://downloads.arduino.cc/packages/package_index.json"),
 				new URL("https://adafruit.github.io/arduino-board-index/package_adafruit_index.json"),
+				new URL("http://arduino.esp8266.com/stable/package_esp8266com_index.json"),
 				new URL("http://drazzy.com/package_drazzy.com_index.json") };
+		// new URL("https://github.com/chipKIT32/chipKIT-core/raw/master/package_chipkit_index.json")
 		ArduinoPreferences.setBoardUrlList(urls);
 
 		Path workspace = Paths.get(ResourcesPlugin.getWorkspace().getRoot().getLocationURI());
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoToolSystem.java b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoToolSystem.java
index cf457af06ff..a4a14135bfc 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoToolSystem.java
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoToolSystem.java
@@ -55,6 +55,7 @@ public class ArduinoToolSystem {
 		case Platform.OS_MACOSX:
 			switch (host) {
 			case "i386-apple-darwin11": //$NON-NLS-1$
+			case "i386-apple-darwin": //$NON-NLS-1$
 			case "x86_64-apple-darwin": //$NON-NLS-1$
 				return true;
 			default:
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/build/ArduinoBuildConfiguration.java b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/build/ArduinoBuildConfiguration.java
index 52f9d0ae13a..0afd951ef54 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/build/ArduinoBuildConfiguration.java
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/build/ArduinoBuildConfiguration.java
@@ -592,9 +592,6 @@ public class ArduinoBuildConfiguration extends CBuildConfiguration implements Te
 			properties.put("upload.verbose", properties.getProperty("upload.params.verbose", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			properties.put("upload.verify", properties.getProperty("upload.params.verify", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
-			// TODO needed this for esptool
-			properties.put("upload.resetmethod", "ck"); //$NON-NLS-1$ //$NON-NLS-2$
-
 			command = resolveProperty("upload.pattern", properties); //$NON-NLS-1$
 		} else {
 			// use the bootloader