diff --git a/AMDiS/libtool b/AMDiS/libtool
index 3b6673371f6b9a9c8f45abefeac61e4c5b70b66e..10b5aa1c338e90d57869a52c6b277086fbe72364 100755
--- a/AMDiS/libtool
+++ b/AMDiS/libtool
@@ -82,13 +82,13 @@ AR="ar"
 AR_FLAGS="cru"
 
 # A C compiler.
-LTCC="gcc"
+LTCC="/usr/lib/openmpi/1.2.7-gcc//bin/mpicc"
 
 # LTCC compiler flags.
 LTCFLAGS="-g -O2"
 
 # A language-specific compiler.
-CC="gcc"
+CC="/usr/lib/openmpi/1.2.7-gcc//bin/mpicc"
 
 # Is the compiler the GNU C compiler?
 with_gcc=yes
@@ -174,7 +174,7 @@ dlopen_self=unknown
 dlopen_self_static=unknown
 
 # Compiler flag to prevent dynamic linking.
-link_static_flag="-static"
+link_static_flag=""
 
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=" -fno-builtin"
@@ -6801,13 +6801,13 @@ AR="ar"
 AR_FLAGS="cru"
 
 # A C compiler.
-LTCC="gcc"
+LTCC="/usr/lib/openmpi/1.2.7-gcc//bin/mpicc"
 
 # LTCC compiler flags.
 LTCFLAGS="-g -O2"
 
 # A language-specific compiler.
-CC="g++"
+CC="/usr/lib/openmpi/1.2.7-gcc//bin/mpiCC"
 
 # Is the compiler the GNU C compiler?
 with_gcc=yes
@@ -6893,7 +6893,7 @@ dlopen_self=unknown
 dlopen_self_static=unknown
 
 # Compiler flag to prevent dynamic linking.
-link_static_flag="-static"
+link_static_flag=""
 
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=" -fno-builtin"
@@ -6960,11 +6960,11 @@ predeps=""
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
+postdeps="-lmpi_cxx -lmpi -lopen-rte -lopen-pal -ldl -lnsl -lutil -ldl -lstdc++ -lm -lgcc_s -lpthread -lc -lgcc_s"
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=`echo "-L/usr/lib/gcc/i386-redhat-linux/4.1.2 -L/usr/lib/gcc/i386-redhat-linux/4.1.2 -L/usr/lib/gcc/i386-redhat-linux/4.1.2/../../.." | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+compiler_lib_search_path=`echo "-L/usr/lib/openmpi/1.2.7-gcc/lib -L/usr/lib/gcc/i386-redhat-linux/4.1.2 -L/usr/lib/gcc/i386-redhat-linux/4.1.2 -L/usr/lib/gcc/i386-redhat-linux/4.1.2/../../.." | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method="pass_all"
@@ -7109,7 +7109,7 @@ AR="ar"
 AR_FLAGS="cru"
 
 # A C compiler.
-LTCC="gcc"
+LTCC="/usr/lib/openmpi/1.2.7-gcc//bin/mpicc"
 
 # LTCC compiler flags.
 LTCFLAGS="-g -O2"
diff --git a/AMDiS/src/ParallelDomainBase.cc b/AMDiS/src/ParallelDomainBase.cc
index 6c72d3443823c553c5258d01bed55ada9ca17e3e..088391038541a2c5aae81e4fee040164b96163d2 100644
--- a/AMDiS/src/ParallelDomainBase.cc
+++ b/AMDiS/src/ParallelDomainBase.cc
@@ -502,25 +502,6 @@ namespace AMDiS {
 	if ((*mat)[i][j])
 	  setDofMatrix((*mat)[i][j], nComponents, i, j);
 
-    if (mpiRank == 0) {
-      std::cout << "TEST 0a: " << mapLocalGlobalDOFs[2] << std::endl;
-
-      for (DofMapping::iterator it = mapLocalToDofIndex.begin();
-	   it != mapLocalToDofIndex.end(); ++it) 
-	if (it->second == 2)
-	  std::cout << "TEST 0b: " << it->first << std::endl;
-
-    } else {
-      std::cout << "TEST 1a " << mapLocalGlobalDOFs[4] << std::endl;
-
-      for (DofMapping::iterator it = mapLocalToDofIndex.begin();
-	   it != mapLocalToDofIndex.end(); ++it) 
-	if (it->second == 4)
-	  std::cout << "TEST 1b: " << it->first << std::endl;
-    }
-
-    exit(0);
-
     MatAssemblyBegin(petscMatrix, MAT_FINAL_ASSEMBLY);
     MatAssemblyEnd(petscMatrix, MAT_FINAL_ASSEMBLY);
 
diff --git a/AMDiS/src/ProblemVec.cc b/AMDiS/src/ProblemVec.cc
index fdcfef122f84be08f66689f0275e3de641961a49..3e8860d697cfb108a07e7a12c51f8aafe3f0ca5d 100644
--- a/AMDiS/src/ProblemVec.cc
+++ b/AMDiS/src/ProblemVec.cc
@@ -766,7 +766,7 @@ namespace AMDiS {
 	  matrix->finishInsertion();
 
  	if (assembleMatrix && matrix->getBoundaryManager())
- 	  matrix->getBoundaryManager()->exitMatrix(matrix);	  
+ 	  matrix->getBoundaryManager()->exitMatrix(matrix);	
 	
 	if (matrix)
 	  nnz += matrix->getBaseMatrix().nnz();