diff --git a/build.sh b/build.sh
index c8c496ea9dc2a0d2119c3b8da0364f7a70c23dd6..d49d6d5d0900188f3ea560014216505fc8f39735 100755
--- a/build.sh
+++ b/build.sh
@@ -43,11 +43,10 @@ if [ x"$hostname" == x"falcon1" ]; then
         echo "falcon1 settings"
 	if [ x"$comp_type" == x"intel" ]; then
         	module load parallel_studio_xe/2019u1
-        	mkdir $HOME/openfpm_dependencies_intel/openfpm_pdata/$branch
 		dependency_dir=/projects/ppm/rundeck/openfpm_dependencies_intel/
 	else
-        	mkdir $HOME/openfpm_dependencies/openfpm_pdata/$branch
-		dependency_dir=/projects/ppm/rundeck/openfpm_dependencies/
+		mkdir /projects/ppm/rundeck/openfpm_dependencies_$branch/
+		dependency_dir=/projects/ppm/rundeck/openfpm_dependencies_$branch/
 	fi
 else
 	dependency_dir=$HOME/openfpm_dependencies/openfpm_pdata/$branch
diff --git a/script/install_MPI.sh b/script/install_MPI.sh
index 660c7eb7514c480f369792bd885e4267c79be49b..58091de4ddec95ca47172506eb329cbf8e166a57 100755
--- a/script/install_MPI.sh
+++ b/script/install_MPI.sh
@@ -10,16 +10,20 @@ fi
 ./script/download_MPI.sh
 cd openmpi-4.0.4
 
+if [ -f mpi_add_options ]; then
+	mpi_options=$(cat mpi_add_options)
+fi
+
 if [ x"$3" == x"1" ]; then
    echo "Installing MPI with GPU support"
 
    # Detect where is nvcc
    cuda_location=$(dirname $(dirname $(which nvcc)) )
 
-   ./configure --with-cuda=$cuda_location --prefix=$1/MPI --enable-mpi-fortran=yes CC=$4 CXX=$5 F77=$6 FC=$7 $8
+   ./configure $mpi_options --with-cuda=$cuda_location --prefix=$1/MPI --enable-mpi-fortran=yes CC=$4 CXX=$5 F77=$6 FC=$7 $8
 else
    echo "Installing MPI without GPU support"
-   ./configure --prefix=$1/MPI --enable-mpi-fortran=yes CC=$4 CXX=$5 F77=$6 FC=$7 $8
+   ./configure $mpi_options --prefix=$1/MPI --enable-mpi-fortran=yes CC=$4 CXX=$5 F77=$6 FC=$7 $8
 fi
 make -j $2
 make install