diff --git a/AMDiS/src/CreatorMap.h b/AMDiS/src/CreatorMap.h
index a5c6ac1117ce8a34b23dff3127edaec0944b4c1c..8a122a025fe335536e540b6b6db0f6c07d5e2707 100644
--- a/AMDiS/src/CreatorMap.h
+++ b/AMDiS/src/CreatorMap.h
@@ -23,7 +23,6 @@
 #define AMDIS_CREATORMAP_H
 
 #include <map>
-
 #include "Global.h"
 #include "CreatorInterface.h"
 
diff --git a/AMDiS/src/ProblemScal.cc b/AMDiS/src/ProblemScal.cc
index bfacb520d05c5b428bc53fca11242909a8e5ce56..841dfd6200687703b51961cb1e8bea8b2be47564 100644
--- a/AMDiS/src/ProblemScal.cc
+++ b/AMDiS/src/ProblemScal.cc
@@ -456,7 +456,7 @@ namespace AMDiS {
   void ProblemScal::createSolver()
   {
     // === create solver ===
-    std::string solverType("no");
+    std::string solverType("0");
     GET_PARAMETER(0, name + "->solver", &solverType);
     OEMSolverCreator *solverCreator = 
       dynamic_cast<OEMSolverCreator*>(CreatorMap<OEMSolver>::getCreator(solverType));
@@ -472,7 +472,7 @@ namespace AMDiS {
     mesh->setElementDataPrototype(NEW LeafDataEstimatable(NEW LeafDataCoarsenable));
 
     // === create estimator ===
-    std::string estimatorType("no");
+    std::string estimatorType("0");
     GET_PARAMETER(0, name + "->estimator", &estimatorType);
     EstimatorCreator *estimatorCreator = 
       dynamic_cast<EstimatorCreator*>(
@@ -647,7 +647,7 @@ namespace AMDiS {
 
   void ProblemScal::createPrecon()
   {
-    ::std::string preconType("no");
+    std::string preconType("no");
     GET_PARAMETER(0, name + "->solver->left precon", &preconType);
 
     CreatorInterface<ITL_BasePreconditioner> *preconCreator = 
diff --git a/AMDiS/src/ProblemVec.cc b/AMDiS/src/ProblemVec.cc
index d175ddeb971b30bf98957a175aee1c15641d2d06..43c563ea952c64942fd2ae59da56da4eda8621b5 100644
--- a/AMDiS/src/ProblemVec.cc
+++ b/AMDiS/src/ProblemVec.cc
@@ -345,7 +345,7 @@ namespace AMDiS {
     FUNCNAME("ProblemVec::createSolver()");
 
     // === create solver ===
-    std::string solverType("no");
+    std::string solverType("0");
     GET_PARAMETER(0, name + "->solver", &solverType);
     OEMSolverCreator *solverCreator = 
       dynamic_cast<OEMSolverCreator*>(CreatorMap<OEMSolver>::getCreator(solverType));
@@ -374,7 +374,7 @@ namespace AMDiS {
       estName = name + "->estimator[" + std::string(number) + "]";
 
       // === create estimator ===
-      std::string estimatorType("no");
+      std::string estimatorType("0");
       GET_PARAMETER(0, estName, &estimatorType);
       EstimatorCreator *estimatorCreator = 
 	dynamic_cast<EstimatorCreator*>(
@@ -824,7 +824,7 @@ namespace AMDiS {
 
   void ProblemVec::createPrecon()
   {
-    ::std::string preconType("no");
+    std::string preconType("no");
     GET_PARAMETER(0, name + "->solver->left precon", &preconType);
 
     CreatorInterface<ITL_BasePreconditioner> *preconCreator =