diff --git a/bootstrap.sh b/bootstrap.sh
index 34249e9..2b4c9d2 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -62,18 +62,21 @@ make -C src/videocapture/videocapture/decklink
 ./bin/easy_install src/mozmill/jsbridge
 
 # Install fennecmark extension required by mobile talos
-hg clone http://hg.mozilla.org/users/tglek_mozilla.com/fennecmark \
-    $TALOS_EXTENSION_DIR/bench@taras.glek
+if [ ! -e $TALOS_EXTENSION_DIR/bench@taras.glek ]; then
+    hg clone http://hg.mozilla.org/users/tglek_mozilla.com/fennecmark \
+        $TALOS_EXTENSION_DIR/bench@taras.glek
+fi
 
 # Link to local extensions required by talos videocapture
-rm $TALOS_EXTENSION_DIR/eideticker@mozilla.com $TALOS_EXTENSION_DIR/jsbridge@mozilla.com
+for I in eideticker@mozilla.com jsbridge@mozilla.com pageloader@mozilla.org; do
+    rm -f $TALOS_EXTENSION_DIR/$I
+done
 ln -sf $BASEDIR/src/ffx-extension $TALOS_EXTENSION_DIR/eideticker@mozilla.com
 ln -sf $BASEDIR/src/mozmill/jsbridge/jsbridge/extension $TALOS_EXTENSION_DIR/jsbridge@mozilla.com
 ln -sf $BASEDIR/src/pageloader $TALOS_EXTENSION_DIR/pageloader@mozilla.org
 
-
 # Install mobile tp4 pageset
-if [ ! -e $TALOS_DIR/page_load_test/mobile_tp4.manifest ]; then
+if [ ! -e $TALOS_DIR/page_load_test/mobile_tp4 ]; then
     wget http://people.mozilla.org/~jmaher/mobile_tp4.zip -O downloads/mobile_tp4.zip
     unzip -o downloads/mobile_tp4.zip -d $TALOS_DIR/page_load_test
 fi