diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4378da78281eb31340ad854e3f421576211783d9..db44d54a8363a23db6d8dd4dde2f021529d55dc4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -185,6 +185,7 @@ add_subdirectory (mcstack)
 add_subdirectory (lhetrack)
 add_subdirectory (kalman)
 add_subdirectory (macro)
+add_subdirectory (clustering)
 add_subdirectory (tpc)
 add_subdirectory (tof)
 add_subdirectory (zdc)
@@ -204,7 +205,6 @@ add_subdirectory (cpc)
 add_subdirectory (shield_pack)
 add_subdirectory (strawECT)
 add_subdirectory (physics/femto)
-add_subdirectory (clustering)
 #add_subdirectory (mpdpid)
 
 if(EXISTS "${CMAKE_SOURCE_DIR}/macro/mpd_scheduler/CMakeLists.txt")
diff --git a/clustering/CMakeLists.txt b/clustering/CMakeLists.txt
index 9c9b9b47eef443755209b2e0f36386df3d32b3f5..0e74a15e6be771e7afd3d04c607ce08f96958129 100644
--- a/clustering/CMakeLists.txt
+++ b/clustering/CMakeLists.txt
@@ -5,16 +5,15 @@
  #         GNU Lesser General Public Licence version 3 (LGPL) version 3,        #  
  #                  copied verbatim in the file "LICENSE"                       #
  ################################################################################
-# Create a library called "libSpdSts" which includes the source files given in
-# the array .
-# The extension is already found.  Any number of sources could be listed here.
+# Create a library called "libClustering" which includes the source files given in
+# the array
 
 set(INCLUDE_DIRECTORIES
 ${ROOT_INCLUDE_DIR} 
 ${CMAKE_SOURCE_DIR}/clustering
 )
 
-include_directories( ${INCLUDE_DIRECTORIES})
+include_directories(${INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
 ${ROOT_LIBRARY_DIR}
@@ -23,7 +22,6 @@ ${ROOT_LIBRARY_DIR}
 link_directories( ${LINK_DIRECTORIES})
 
 set(MPDCLUSTER_SRCS
-
 ClusterElement.cxx
 Cluster.cxx
 ClusterCollection.cxx
diff --git a/emc/clustering/EmcClusterCollection.h b/emc/clustering/EmcClusterCollection.h
index e8d6e0e56c9c02009a4959a20f4f8dac85df5b29..f6a0eb234bbbf3cbcad38a80787474ed7773e9c6 100644
--- a/emc/clustering/EmcClusterCollection.h
+++ b/emc/clustering/EmcClusterCollection.h
@@ -25,7 +25,7 @@ public:
 
     EmcClusterCollection();
     EmcClusterCollection(Int_t uid);
-    EmcClusterCollection(TString name);
+    //EmcClusterCollection(TString name);
     
     virtual ~EmcClusterCollection();
 
diff --git a/generators/MpdLAQGSMGenerator.cxx b/generators/MpdLAQGSMGenerator.cxx
index 3926ac109ad19fab8214733752c473aa831ee3bc..9fa7a15003e05d1360e1075e34621d3522247997 100644
--- a/generators/MpdLAQGSMGenerator.cxx
+++ b/generators/MpdLAQGSMGenerator.cxx
@@ -35,7 +35,10 @@ const Double_t kProtonMass = 0.938272013;
 const Double_t kNeutronMass = 0.93957;
 
 // -----   Default constructor   ------------------------------------------
-MpdLAQGSMGenerator::MpdLAQGSMGenerator() {}
+MpdLAQGSMGenerator::MpdLAQGSMGenerator() :
+    fInputFile(NULL),
+    fGZInputFile(NULL)
+{}
 // ------------------------------------------------------------------------
 
 
@@ -43,7 +46,9 @@ MpdLAQGSMGenerator::MpdLAQGSMGenerator() {}
 // -----   Standard constructor   -----------------------------------------
 MpdLAQGSMGenerator::MpdLAQGSMGenerator(const char* fileName, const Bool_t use_collider_system, Int_t QGSM_format_ID,Int_t Max_Event_Number ) : 
    FairGenerator(),
-   fIonMap()
+   fIonMap(),
+   fInputFile(NULL),
+   fGZInputFile(NULL)
 {
 
   //AZ memset(la_tab,0,sizeof(la_tab));
@@ -53,9 +58,6 @@ MpdLAQGSMGenerator::MpdLAQGSMGenerator(const char* fileName, const Bool_t use_co
   fFileName  = fileName;
   cout << "-I- MpdLAQGSMGenerator: Opening input file " << fileName << endl;
 
-  fInputFile=NULL;
-  fGZInputFile = NULL;
-
   TString sFileName = fileName;
   if (sFileName.Contains(".gz"))
     fGZ_input=1;
diff --git a/macro/mpd_scheduler b/macro/mpd_scheduler
index 3c84fd363859e5a8da81d320fc578efcaa70fb11..11b65750e23c7de6c36c6444f39370da2f1d1a13 160000
--- a/macro/mpd_scheduler
+++ b/macro/mpd_scheduler
@@ -1 +1 @@
-Subproject commit 3c84fd363859e5a8da81d320fc578efcaa70fb11
+Subproject commit 11b65750e23c7de6c36c6444f39370da2f1d1a13
diff --git a/mpdfield/MpdFieldMap.cxx b/mpdfield/MpdFieldMap.cxx
index f87a336c9da22184e5c121c7b3325944008b2726..871813d1522dae78ff839824a1081ee0a89fcacc 100644
--- a/mpdfield/MpdFieldMap.cxx
+++ b/mpdfield/MpdFieldMap.cxx
@@ -552,4 +552,10 @@ void MpdFieldMap::GetFieldValue(const Double_t point[3], Double_t* bField) {
   bField[2] = GetBz(point[0], point[1], point[2]);
 }
 
+Double_t MpdFieldMap::Interpolate(Double_t dx, Double_t dy, Double_t dz)
+{
+    cout<<"MpdFieldMap::Interpolate( is not implemented!!!"<<endl;
+    return 0;
+}
+
 ClassImp(MpdFieldMap)
diff --git a/tpc/MpdTpcClusterFinderTask.h b/tpc/MpdTpcClusterFinderTask.h
index 0f793cd882b3015eff6dc2608038e645893588cb..7d669d4076276ea48c31da3a3753414e52b9b138 100644
--- a/tpc/MpdTpcClusterFinderTask.h
+++ b/tpc/MpdTpcClusterFinderTask.h
@@ -55,7 +55,7 @@ public:
 
     Bool_t Find2DClusters(vector<MpdTpc2dCluster*> *extClust, DigOrigArray **digArr, UInt_t row, UInt_t sec);
     void FindPeaksInCluster(MpdTpc2dCluster* clust, vector<MpdTpcPeak*> *peakList, DigOrigArray** fOriginsArray);
-    void FindPeaksInClusterNew(MpdTpc2dCluster* clust, vector<MpdTpcPeak*> *peakList, DigOrigArray** fOriginsArray);
+    //void FindPeaksInClusterNew(MpdTpc2dCluster* clust, vector<MpdTpcPeak*> *peakList, DigOrigArray** fOriginsArray);
     void CollectPeaks(vector<MpdTpcPeak*> peakList, MpdTpc2dCluster* clust, vector<MpdTpcPeak*> *collectedPeakList);
     void CreateHit(vector<MpdTpcPeak*> collectedPeakList, MpdTpc2dCluster* clust, vector<MpdTpcFoundHit*> *hitList, DigOrigArray** fOriginsArray);
     Bool_t GetNextDigit(UInt_t* currDig, MpdTpc2dCluster* Clus2d, DigOrigArray **digArr, Bool_t **fADCMarks);