diff --git a/bin/cbuildbot.py b/bin/cbuildbot.py
index 794bf15013..e01fe18627 100755
--- a/bin/cbuildbot.py
+++ b/bin/cbuildbot.py
@@ -263,6 +263,14 @@ def _WipeOldOutput(buildroot):
   RunCommand(['rm', '-rf', 'src/build/images'], cwd=buildroot)
 
 
+def _EnableLocalAccount(buildroot):
+  cwd = os.path.join(buildroot, 'src', 'scripts')
+  # Set local account for test images.
+  RunCommand(['./enable_localaccount.sh',
+             'chronos'],
+             print_cmd=False, cwd=cwd)
+
+
 def _BuildImage(buildroot):
   _WipeOldOutput(buildroot)
 
@@ -415,6 +423,7 @@ def main():
     if buildconfig['uprev']:
       _UprevPackages(buildroot, revisionfile, board=buildconfig['board'])
 
+    _EnableLocalAccount(buildroot)
     _Build(buildroot)
     if buildconfig['unittests']:
       _RunUnitTests(buildroot)
diff --git a/bin/cbuildbot_config.py b/bin/cbuildbot_config.py
index dda1ef8a50..2e68b0e43f 100644
--- a/bin/cbuildbot_config.py
+++ b/bin/cbuildbot_config.py
@@ -48,7 +48,6 @@ config['x86_pineview_bin'] = {
   'important' : False,
   'hostname' : 'codf200.jail',
   'unittests': True,
-  'smoke_bvt' : True,
 }
 config['arm_tegra2_bin'] = {
   'board' : 'tegra2',
diff --git a/enter_chroot.sh b/enter_chroot.sh
index 5b412f4d6e..c0e45ba2ab 100755
--- a/enter_chroot.sh
+++ b/enter_chroot.sh
@@ -272,7 +272,7 @@ setup_env
 # hand-sync'd some subdirs and edited files in others.
 # In that case, check against origin/HEAD and mark** revision.
 # Use git:8 chars of sha1
-REVISION=$(git rev-parse --short=8 HEAD)
+REVISION=$(cd ${FLAGS_trunk}/src/scripts ; git rev-parse --short=8 HEAD)
 CHROOT_PASSTHRU="CHROMEOS_REVISION=$REVISION BUILDBOT_BUILD=$FLAGS_build_number CHROMEOS_OFFICIAL=$CHROMEOS_OFFICIAL"
 if [ -d "$HOME/.subversion" ]; then
   # Bind mounting .subversion into chroot
diff --git a/image_to_usb.sh b/image_to_usb.sh
index f40e57a4a3..81a3ab58dd 100755
--- a/image_to_usb.sh
+++ b/image_to_usb.sh
@@ -236,7 +236,11 @@ then
 
   if [ ${FLAGS_install} -ne ${FLAGS_TRUE} ]; then
     echo "Copying ${SRC_IMAGE} to ${FLAGS_to}..."
-    sudo dd if="${SRC_IMAGE}" of="${FLAGS_to}" bs=4M
+    if type pv >/dev/null 2>&1; then
+      sudo pv -ptre "${SRC_IMAGE}" | sudo dd of="${FLAGS_to}" bs=4M oflag=sync
+    else
+      sudo dd if="${SRC_IMAGE}" of="${FLAGS_to}" bs=4M oflag=sync
+    fi
     sync
   else
     if [ ${INSIDE_CHROOT} -ne 1 ]; then