diff --git a/meta-intel-arduino/conf/layer.conf b/meta-intel-arduino/conf/layer.conf
index dfa340bd..b492d7ef 100644
--- a/meta-intel-arduino/conf/layer.conf
+++ b/meta-intel-arduino/conf/layer.conf
@@ -8,3 +8,5 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "intel-arduino"
 BBFILE_PATTERN_intel-arduino = "^${LAYERDIR}/"
 BBFILE_PRIORITY_intel-arduino = "6"
+
+LAYERSERIES_COMPAT_intel-edison-bsp = "rocko sumo thud warrior"
diff --git a/meta-intel-arduino/recipes-devtools/clloader/clloader.bb b/meta-intel-arduino/recipes-devtools/clloader/clloader.bb
index 26f3ee7b..209b201b 100644
--- a/meta-intel-arduino/recipes-devtools/clloader/clloader.bb
+++ b/meta-intel-arduino/recipes-devtools/clloader/clloader.bb
@@ -4,6 +4,8 @@ LICENSE = "LGPLv2.1"
 
 S = "${WORKDIR}/git"
 
+TARGET_CC_ARCH += "${LDFLAGS}"
+
 SRC_URI = "git://github.com/01org/clloader.git;protocol=https;branch=edison \
             file://clloader.service \
             file://sketch_reset.service"
diff --git a/meta-intel-edison-distro/recipes-core/images/edison-image.bb b/meta-intel-edison-distro/recipes-core/images/edison-image.bb
index 6cdbd21f..36e4e149 100644
--- a/meta-intel-edison-distro/recipes-core/images/edison-image.bb
+++ b/meta-intel-edison-distro/recipes-core/images/edison-image.bb
@@ -58,7 +58,7 @@ IMAGE_INSTALL_append = " swig"
 
 
 # Edison Arduino stuff
-#IMAGE_INSTALL_append = " clloader"
+IMAGE_INSTALL_append = " clloader"
 
 # Edison Middleware stuff
 IMAGE_INSTALL_append = " packagegroup-core-buildessential"