diff --git a/scripts/oe-find-native-sysroot b/scripts/oe-find-native-sysroot
old mode 100644
new mode 100755
diff --git a/scripts/oe-git-proxy-command b/scripts/oe-git-proxy-command
old mode 100644
new mode 100755
diff --git a/scripts/oe-git-proxy-socks-command b/scripts/oe-git-proxy-socks-command
old mode 100644
new mode 100755
diff --git a/scripts/oe-git-proxy-socks.c b/scripts/oe-git-proxy-socks.c
old mode 100644
new mode 100755
diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
old mode 100644
new mode 100755
index 2f8a0646b9..58c9ad67e1
--- a/scripts/oe-setup-builddir
+++ b/scripts/oe-setup-builddir
@@ -37,6 +37,8 @@ fi
 
 cd "$BUILDDIR"
 
+TEMPLATECONF=meta-yocto/conf
+
 # 
 # $TEMPLATECONF can point to a directory for the template local.conf & bblayers.conf
 #
@@ -51,8 +53,8 @@ if [ "x" != "x$TEMPLATECONF" ]; then
 	    return
 	fi
     fi
-    OECORELAYERCONF="$TEMPLATECONF/bblayers.conf"
-    OECORELOCALCONF="$TEMPLATECONF/local.conf"
+    OECORELAYERCONF="$TEMPLATECONF/bblayers.conf.sample"
+    OECORELOCALCONF="$TEMPLATECONF/local.conf.sample"
 fi
 
 if [ "x" = "x$OECORELOCALCONF" ]; then
diff --git a/scripts/oe-setup-rpmrepo b/scripts/oe-setup-rpmrepo
old mode 100644
new mode 100755
diff --git a/scripts/oe-trim-schemas b/scripts/oe-trim-schemas
old mode 100644
new mode 100755
diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
old mode 100644
new mode 100755
diff --git a/scripts/runqemu-addptable2image b/scripts/runqemu-addptable2image
old mode 100644
new mode 100755
diff --git a/scripts/runqemu-export-rootfs b/scripts/runqemu-export-rootfs
old mode 100644
new mode 100755
diff --git a/scripts/runqemu-extract-sdk b/scripts/runqemu-extract-sdk
old mode 100644
new mode 100755
diff --git a/scripts/runqemu-gen-tapdevs b/scripts/runqemu-gen-tapdevs
old mode 100644
new mode 100755