diff --git a/build.sh b/build.sh
index 315b084c2f83399b67148cc592b5942ede9568fd..53c8d082932688059328187e7385f82edcf08e13 100755
--- a/build.sh
+++ b/build.sh
@@ -2,6 +2,6 @@
 rm -rf build install
 mkdir build
 cd build
-cmake .. -DCMAKE_INSTALL_PREFIX=../install -DMPIEXEC="/opt/intel/compilers_and_libraries_2017.4.196/linux/mpi/intel64/bin/mpirun" -DMPIEXEC_NUMPROC_FLAG="-n" -DPAPYRUS_USE_FORTRAN=ON # Stampede2
-#cmake .. -DCMAKE_INSTALL_PREFIX=../install -DMPIEXEC="/opt/slurm/default/bin/srun" -DMPIEXEC_NUMPROC_FLAG="-n" -DPAPYRUS_USE_FORTRAN=ON #Grand Tave
+#cmake .. -DCMAKE_INSTALL_PREFIX=../install -DMPIEXEC="/opt/intel/compilers_and_libraries_2017.4.196/linux/mpi/intel64/bin/mpirun" -DMPIEXEC_NUMPROC_FLAG="-n" -DPAPYRUS_USE_FORTRAN=ON # Stampede2
+cmake .. -DCMAKE_INSTALL_PREFIX=../install -DMPIEXEC="/opt/slurm/default/bin/srun" -DMPIEXEC_NUMPROC_FLAG="-n" -DPAPYRUS_USE_FORTRAN=ON #Grand Tave
 make -j install
diff --git a/kv/src/CMakeLists.txt b/kv/src/CMakeLists.txt
index 46eeb03dc978e55b96edfec99ebca968a92d2ffe..35e3b0d35d54a7d2369da2030f48edd777c5bed0 100644
--- a/kv/src/CMakeLists.txt
+++ b/kv/src/CMakeLists.txt
@@ -33,5 +33,5 @@ add_library(papyruskv ${PAPYRUSKV_SOURCES})
 install(TARGETS papyruskv DESTINATION lib)
 
 if(PAPYRUS_USE_FORTRAN)
-   install(FILES papyrus.mod DESTINATION include)
+    install(FILES ${PROJECT_BINARY_DIR}/kv/src/papyrus.mod DESTINATION include)
 endif()
diff --git a/kv/tests/14_fortran/test14_fortran.f90 b/kv/tests/14_fortran/test14_fortran.f90
index 5576bd26ac79615512007e5fe071fca40616f3dc..68be05e9e2fcbb3c18dff781986806978c47d713 100644
--- a/kv/tests/14_fortran/test14_fortran.f90
+++ b/kv/tests/14_fortran/test14_fortran.f90
@@ -11,7 +11,7 @@ PROGRAM TEST14_FORTRAN
     INTEGER(KIND=8) :: KEYLEN, VALLEN
 
     CALL MPI_INIT_THREAD(MPI_THREAD_MULTIPLE, PROVIDED, IERROR)
-    CALL MPI_BARRIER(MPI_COMM_WORLD, IERROR)
+    PRINT*, 'THIS IS A HACK CODE FOR PORTABILITY'
     CALL PAPYRUSKV_INIT('./pkv_repo', IERROR)
     IF (IERROR /= PAPYRUSKV_OK) THEN
         PRINT*, 'FAILED'
diff --git a/kv/tests/CMakeLists.txt b/kv/tests/CMakeLists.txt
index c74ceb759703df2ad956ad2fd01f0ec9e2e345c1..da00eee1bb43e65d8731cd24c0ee5dbe8af4b972 100644
--- a/kv/tests/CMakeLists.txt
+++ b/kv/tests/CMakeLists.txt
@@ -8,7 +8,7 @@ macro(papyruskv_test arg)
 endmacro(papyruskv_test)
 
 macro(papyruskv_test_fortran arg)
-    include_directories(${PROJECT_SOURCE_DIR}/kv/src)
+    include_directories(${PROJECT_BINARY_DIR}/kv/src)
     add_executable(kv.${arg} ${arg}.f90)
     target_link_libraries(kv.${arg} papyruskv pthread stdc++)
     add_test(kv.${arg} ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ./kv.${arg})