diff --git a/hpvm/scripts/automate_tests.sh b/hpvm/scripts/automate_tests.sh
index 565d20754732b77f58acc96b08cd96bfb29ba6e2..e3b63dba82b56754cd4577f20cde6422eb096c04 100644
--- a/hpvm/scripts/automate_tests.sh
+++ b/hpvm/scripts/automate_tests.sh
@@ -2,6 +2,7 @@
 
 CURRENT_DIR=`pwd`
 BUILD_DIR=$CURRENT_DIR/build
+HPVM_RT=hpvm-rt/hpvmrt.bc
 
 if [ -x $BUILD_DIR/tools/hpvm/projects/$HPVM_RT ]; then
     true
diff --git a/hpvm/scripts/llvm_installer.sh b/hpvm/scripts/llvm_installer.sh
index f878ae077c043dbc03b3bae3be16494ce676f9a2..734023529dc247a2d2b3fcdbf80ac6bc27ae90e5 100755
--- a/hpvm/scripts/llvm_installer.sh
+++ b/hpvm/scripts/llvm_installer.sh
@@ -19,7 +19,7 @@ LLVM_SRC="llvm-$VERSION.src"
 LIBCXX_SRC="libcxx-$VERSION.src"
 LIBCXXABI_SRC="libcxxabi-$VERSION.src"
 
-HPVM_RT=hpvm-rt.bc
+HPVM_RT=hpvm-rt/hpvm-rt.bc
 
 AUTOMATE="y"
 
@@ -92,7 +92,7 @@ cd $CURRENT_DIR
 if [ -d $CURRENT_DIR/$LLVM_SRC/projects ]; then
     cd $CURRENT_DIR/$LLVM_SRC/projects
 else
-    echo Fail! Something is wrong wint $LLVM_SRC.
+    echo Fail! Something is wrong with $LLVM_SRC.
     exit 1
 fi