diff --git a/core/main.mk b/core/main.mk
index 0b43efe..ba67189 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -819,7 +819,7 @@
   # For uninstallable modules such as static Java library, we have to dist the built file,
   # as <module_name>.<suffix>
   apps_only_dist_built_files := $(foreach m,$(unbundled_build_modules),$(if $(ALL_MODULES.$(m).INSTALLED),,\
-      $(ALL_MODULES.$(m).BUILT):$(m)$(suffix $(ALL_MODULES.$(m).BUILT))))
+      $(if $(ALL_MODULES.$(m).BUILT),$(ALL_MODULES.$(m).BUILT):$(m)$(suffix $(ALL_MODULES.$(m).BUILT)))))
   $(call dist-for-goals,apps_only, $(apps_only_dist_built_files))
 
   ifeq ($(EMMA_INSTRUMENT),true)
diff --git a/envsetup.sh b/envsetup.sh
index f86081d..0661fe6 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -803,7 +803,7 @@
 
     local EXE="$1"
     if [ "$EXE" ] ; then
-		qpid | grep "$prepend$EXE$append"
+		qpid | \grep "$prepend$EXE$append"
 	else
 		adb shell ps \
 			| tr -d '\r' \
@@ -824,7 +824,7 @@
     if [ "$EXE" ] ; then
         local PID=`adb shell ps \
             | tr -d '\r' \
-            | grep "$prepend$EXE$append" \
+            | \grep "$prepend$EXE$append" \
             | sed -e 's/^[^ ]* *\([0-9]*\).*$/\1/'`
         echo "$PID"
     else
@@ -930,7 +930,7 @@
                if [[ ! "$PID" =~ ^[0-9]+$ ]] ; then
                    # that likely didn't work because of returning multiple processes
                    # try again, filtering by root processes (don't contain colon)
-                   PID=`adb shell ps | grep $3 | grep -v ":" | awk '{print $2}'`
+                   PID=`adb shell ps | \grep $3 | \grep -v ":" | awk '{print $2}'`
                    if [[ ! "$PID" =~ ^[0-9]+$ ]]
                    then
                        echo "Couldn't resolve '$3' to single PID"