diff --git a/aosp.sh b/aosp.sh
index b737242..91813e5 100755
--- a/aosp.sh
+++ b/aosp.sh
@@ -13,7 +13,7 @@ function repo_init() {
 
 function repo_sync() {
 	cd $TUNASYNC_WORKING_DIR
-	$REPO sync -f
+	$REPO sync -f -j1 || echo "WARNING: repo-sync may fail, but we just ignore it."
 }
 
 function git_repack() {
diff --git a/weave.sh b/weave.sh
index 731f58f..f0647f1 100755
--- a/weave.sh
+++ b/weave.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 set -e
 
 USE_BITMAP_INDEX=${USE_BITMAP_INDEX:-"0"}