diff --git a/meta-digi-arm/conf/layer.conf b/meta-digi-arm/conf/layer.conf
index c4672d801..616c9cf64 100644
--- a/meta-digi-arm/conf/layer.conf
+++ b/meta-digi-arm/conf/layer.conf
@@ -9,10 +9,8 @@ BBFILE_COLLECTIONS += "digi-arm"
 BBFILE_PATTERN_digi-arm := "^${LAYERDIR}/"
 BBFILE_PRIORITY_digi-arm = "5"
 
-# This is Digi's General license agreement.
+# Digi's General and Open Source license agreements
 DIGI_EULA_FILE = "${LAYERDIR}/DIGI_EULA"
-
-# This is Digi's Open Source license agreement.
 DIGI_OPEN_EULA_FILE = "${LAYERDIR}/DIGI_OPEN_EULA"
 
 DIGI_LOG_GIT ?= "git://log-sln-git.digi.com/"
diff --git a/meta-digi-dey/conf/layer.conf b/meta-digi-dey/conf/layer.conf
index bc1ee92a9..cec2d83a6 100644
--- a/meta-digi-dey/conf/layer.conf
+++ b/meta-digi-dey/conf/layer.conf
@@ -14,6 +14,10 @@ BBFILE_COLLECTIONS += "dey"
 BBFILE_PATTERN_dey := "^${LAYERDIR}/"
 BBFILE_PRIORITY_dey = "6"
 
+# Digi's General and Open Source license agreements
+DIGI_EULA_FILE = "${LAYERDIR}/DIGI_EULA"
+DIGI_OPEN_EULA_FILE = "${LAYERDIR}/DIGI_OPEN_EULA"
+
 # Digi mirror for packages vanished upstream
 DIGI_MIRROR ?= "ftp://ftp1.digi.com/support/digiembeddedyocto/mirror/"
 MIRRORS += "\
@@ -21,9 +25,3 @@ ftp://.*/.*      ${DIGI_MIRROR} \n \
 http://.*/.*     ${DIGI_MIRROR} \n \
 https://.*/.*    ${DIGI_MIRROR} \n \
 "
-
-# This is Digi's General license agreement.
-DIGI_EULA_FILE = "${LAYERDIR}/DIGI_EULA"
-
-# This is Digi's Open Source license agreement.
-DIGI_OPEN_EULA_FILE = "${LAYERDIR}/DIGI_OPEN_EULA"
diff --git a/sdk/mkproject.sh b/sdk/mkproject.sh
index 46df4d9c7..cc6d31ac3 100755
--- a/sdk/mkproject.sh
+++ b/sdk/mkproject.sh
@@ -114,7 +114,7 @@ do_mkproject() {
 	if [ -z "${MKP_OLD_PROJECT}" ]; then
 		# Customize project
 		chmod 644 ${MKP_PROJECTPATH}/conf/bblayers.conf ${MKP_PROJECTPATH}/conf/local.conf
-		sed -i  -e "s,##DIGIBASE##,${MKP_SCRIPTPATH}/sources,g" ${MKP_PROJECTPATH}/conf/bblayers.conf
+		sed -i -e "s,##DIGIBASE##,${MKP_SCRIPTPATH}/sources,g" ${MKP_PROJECTPATH}/conf/bblayers.conf
 		if [ -n "${MKP_VARIANT+x}" ]; then
 			sed -i -e "/^MACHINE_VARIANT =/cMACHINE_VARIANT = \"${MKP_VARIANT}\"" \
 				${MKP_PROJECTPATH}/conf/local.conf