diff --git a/build/envsetup.sh b/build/envsetup.sh
index ba19ba1..153f541 100644
--- a/build/envsetup.sh
+++ b/build/envsetup.sh
@@ -771,7 +771,7 @@
 # Return success if adb is up and not in recovery
 function _adb_connected {
     {
-        if [[ "$(adb get-state)" == device ]]
+        if [[ "$(adb get-state)" == "device" ]]
         then
             return 0
         fi
@@ -1064,20 +1064,20 @@
 	checkofficial $1
 
 	# Breakfast extension	
-	if [ $TARGET_BUILD_VARIANT == "user" ];then
+	if [ "$TARGET_BUILD_VARIANT" == "user" ];then
 		breakfast $* user
-	elif [ $TARGET_BUILD_VARIANT == "eng" ];then
+	elif [ "$TARGET_BUILD_VARIANT" == "eng" ];then
 		breakfast $* eng
 	else
     	breakfast $*
 	fi
 
-        if [ $clean == "y" ];then
+        if [ "$clean" == "y" ];then
                 echo "Cleaning up a bit"
                 make clean && make clobber
         fi
 
-        if [ $deviceclean == "y" ];then
+        if [ "$deviceclean" == "y" ];then
                 echo "Doing some device cleanup"
                 make deviceclean
         fi