diff --git a/Code/Learning/otbListSampleGenerator.h b/Code/Learning/otbListSampleGenerator.h
index 2606f3ecd4312da683cf957daa18a23935e25328..3b359b34c0df36c5fad98677e70acd88a4fbe2bf 100644
--- a/Code/Learning/otbListSampleGenerator.h
+++ b/Code/Learning/otbListSampleGenerator.h
@@ -94,14 +94,17 @@ public:
   virtual void Update();
   
   /** Accessors */
-  itkGetMacro(MaxTrainingSize, int);
-  itkSetMacro(MaxTrainingSize, int);
-  itkGetMacro(MaxValidationSize, int);
-  itkSetMacro(MaxValidationSize, int);
-  itkGetMacro(ValidationTrainingProportion, double);
+  itkGetConstMacro(MaxTrainingSize, long int);
+  itkSetMacro(MaxTrainingSize, long int);
+  itkGetConstMacro(MaxValidationSize, long int);
+  itkSetMacro(MaxValidationSize, long int);
+  itkGetConstMacro(ValidationTrainingProportion, double);
   itkSetClampMacro(ValidationTrainingProportion, double, 0.0, 1.0);
 
-  itkGetMacro(NumberOfClasses, unsigned short);
+  itkGetConstMacro(NumberOfClasses, unsigned short);
+  typedef std::map<int, int> SampleNumberType;
+  itkGetConstMacro(ClassesSamplesNumberTraining, SampleNumberType);
+  itkGetConstMacro(ClassesSamplesNumberValidation, SampleNumberType);
 
   itkGetStringMacro(ClassKey);
   itkSetStringMacro(ClassKey);
@@ -126,8 +129,8 @@ private:
   void GenerateClassStatistics();
   void ComputeClassSelectionProbability();
   
-  int    m_MaxTrainingSize; // number of traning samples (-1 = no limit)
-  int    m_MaxValidationSize; // number of validation samples (-1 = no limit)
+  long int    m_MaxTrainingSize; // number of training samples (-1 = no limit)
+  long int    m_MaxValidationSize; // number of validation samples (-1 = no limit)
   double m_ValidationTrainingProportion; // proportion of training vs validation 
                                          // (0.0 = all training, 1.0 = all validation)
 
diff --git a/Code/Visualization/otbPixelDescriptionModel.h b/Code/Visualization/otbPixelDescriptionModel.h
index c3fb195248a715b9b97265d2ed06b83adcc757e9..eae9b1816a53becfb1baf743888e2a4474ce9444 100644
--- a/Code/Visualization/otbPixelDescriptionModel.h
+++ b/Code/Visualization/otbPixelDescriptionModel.h
@@ -26,7 +26,7 @@
 namespace otb
 {
 /** \class PixelDescriptionModel
-*   \brief This class is a layer based model reporting pixel  information
+*   \brief This class is a layer based model reporting pixel information
 *
 *   \sa ImageLayer
 *