diff --git a/AMDiS/src/DOFMatrix.cc b/AMDiS/src/DOFMatrix.cc
index bd60a0e2e396fa935ad7c27ceab3f1beb90d430b..a4a71ed5d2be4a95cc4280ba6ba2c0a93e382c11 100644
--- a/AMDiS/src/DOFMatrix.cc
+++ b/AMDiS/src/DOFMatrix.cc
@@ -18,7 +18,6 @@
 namespace AMDiS {
 
   using namespace mtl;
-  using boost::lexical_cast;
 
   DOFMatrix *DOFMatrix::traversePtr = NULL;
 
diff --git a/AMDiS/src/Operator.cc b/AMDiS/src/Operator.cc
index 97053258451523f8a0b999297b3d01151f63dff5..c38dc53db64440c85abeac6af96142a3349c8a4a 100644
--- a/AMDiS/src/Operator.cc
+++ b/AMDiS/src/Operator.cc
@@ -6,13 +6,8 @@
 #include "Quadrature.h"
 #include "OpenMP.h"
 
-#include "boost/lexical_cast.hpp"
-#include <fstream>
-
 namespace AMDiS {
 
-  using boost::lexical_cast;
-
   const Flag OperatorTerm::PW_CONST = 1;
   const Flag OperatorTerm::SYMMETRIC = 2;
 
diff --git a/AMDiS/src/SecondOrderAssembler.cc b/AMDiS/src/SecondOrderAssembler.cc
index 7ac17dc902c0d3cf2c63e6c2cab9f71d79fd646f..dd808cbde22b1b036ec1c478d57c2907da338a5d 100644
--- a/AMDiS/src/SecondOrderAssembler.cc
+++ b/AMDiS/src/SecondOrderAssembler.cc
@@ -188,13 +188,13 @@ namespace AMDiS {
 	tmpLALt[myRank][j] = new DimMat<double>(dim, NO_INIT);      
 
 #ifdef _OPENMP
-#pragma omp critical (dofIndexAccess)
+#pragma omp critical
 #endif
       {   
-      psiFast = updateFastQuadrature(psiFast, owner->getRowFESpace()->getBasisFcts(), 
-				     INIT_GRD_PHI);
-      phiFast = updateFastQuadrature(phiFast, owner->getRowFESpace()->getBasisFcts(), 
-				     INIT_GRD_PHI);
+        psiFast = updateFastQuadrature(psiFast, owner->getRowFESpace()->getBasisFcts(), 
+  				       INIT_GRD_PHI);
+        phiFast = updateFastQuadrature(phiFast, owner->getRowFESpace()->getBasisFcts(), 
+				       INIT_GRD_PHI);
       }
       firstCall = false;
     }