diff --git a/config.sh b/config.sh
index bbb0c50a..6bab5e1c 100755
--- a/config.sh
+++ b/config.sh
@@ -122,7 +122,7 @@ case "$1" in
 
 "flame")
 	echo PRODUCT_NAME=$1 >> .tmp-config &&
-	repo_sync $1
+       repo_sync $1
 	;;
 
 "fugu")
diff --git a/flash.sh b/flash.sh
index a1fca8f4..9c36f1e3 100755
--- a/flash.sh
+++ b/flash.sh
@@ -333,7 +333,7 @@ case "$DEVICE" in
 	exit $?
 	;;
 
-"otoro"|"unagi"|"keon"|"peak"|"inari"|"sp8810ea"|"wasabi"|"flatfish")
+"flame"|"otoro"|"unagi"|"keon"|"peak"|"inari"|"sp8810ea"|"wasabi"|"flatfish")
 	flash_fastboot nounlock $PROJECT
 	;;
 
diff --git a/load-config.sh b/load-config.sh
index e00a4739..6ea0618a 100644
--- a/load-config.sh
+++ b/load-config.sh
@@ -18,3 +18,8 @@ fi
 if [ -z $GECKO_PATH ]; then
   GECKO_PATH=$B2G_DIR/gecko
 fi
+
+VARIANT=${VARIANT:-eng}
+PRODUCT_NAME=${PRODUCT_NAME:-full_${DEVICE}}
+DEVICE=${DEVICE:-${PRODUCT_NAME}}
+LUNCH=${LUNCH:-${PRODUCT_NAME}-${VARIANT}}
diff --git a/setup.sh b/setup.sh
index b38a4371..5b5796bc 100644
--- a/setup.sh
+++ b/setup.sh
@@ -2,11 +2,6 @@
 
 . load-config.sh
 
-VARIANT=${VARIANT:-eng}
-PRODUCT_NAME=${PRODUCT_NAME:-full_${DEVICE}}
-DEVICE=${DEVICE:-${PRODUCT_NAME}}
-LUNCH=${LUNCH:-${PRODUCT_NAME}-${VARIANT}}
-
 export USE_CCACHE=yes &&
 export GECKO_PATH &&
 export GAIA_PATH &&