diff --git a/Code/Visualization/Viewer/Model/otbViewerModel.cxx b/Code/Visualization/Viewer/Model/otbViewerModel.cxx
index d88ba6a4798cacb4c01533fde5a467ee7bd203e6..6f9584dbfa3f8adfe9e9439a38b43000352cd810 100644
--- a/Code/Visualization/Viewer/Model/otbViewerModel.cxx
+++ b/Code/Visualization/Viewer/Model/otbViewerModel.cxx
@@ -142,7 +142,7 @@ ViewerModel
   // If jpeg2000, add the selected resolution at the end of the file name
   if( isJPEG2000 )
     {
-    unsigned int resolution = 0;
+//     unsigned int resolution = 0;
     otbFilepath += ":";
     std::ostringstream ossRes;
     ossRes << id;
@@ -174,8 +174,8 @@ ViewerModel
     }
   //// If not jpeg2000 or trouble in jpeg2000 quicloock, use a
   //// streaming shrink image filter
-  unsigned int maxSize = std::max( reader->GetOutput()->GetLargestPossibleRegion().GetSize()[0],
-                                   reader->GetOutput()->GetLargestPossibleRegion().GetSize()[1] );
+//   unsigned int maxSize = std::max( reader->GetOutput()->GetLargestPossibleRegion().GetSize()[0],
+//                                    reader->GetOutput()->GetLargestPossibleRegion().GetSize()[1] );
   if (quicklook.IsNull())
     {
     typedef otb::StreamingShrinkImageFilter<ImageType> StreamingShrinkImageFilterType;
diff --git a/Testing/Applications/DisparityMap/CMakeLists.txt b/Testing/Applications/DisparityMap/CMakeLists.txt
index 0657a98cf3516f6b51e9c6ee7528fdf21b1f38f7..67e56d71183612947ca4a9e51fa328fabecd11ed 100644
--- a/Testing/Applications/DisparityMap/CMakeLists.txt
+++ b/Testing/Applications/DisparityMap/CMakeLists.txt
@@ -15,7 +15,7 @@ OTB_TEST_APPLICATION(NAME  apTvDmStereoSensorModelToElevationMapTest
                              -step 1.0
                              -elev dem
                              -elev.dem.path ${INPUTDATA}/DEM/srtm_directory/
-                             -geoid ${INPUTDATA}/DEM/egm96.grd
+                             -elev.dem.geoid ${INPUTDATA}/DEM/egm96.grd
                      VALID   --compare-image ${EPSILON_10}
                              ${BASELINE}/apTvDmStereoSensorModelToElevationMapTest.tif
                              ${TEMP}/apTvDmStereoSensorModelToElevationMapTest.tif)
@@ -33,7 +33,7 @@ OTB_TEST_APPLICATION(NAME  apTvDmStereoSensorModelToElevationMapWithSmoothing
                              -step 1.0
                              -elev dem
                              -elev.dem.path ${INPUTDATA}/DEM/srtm_directory/
-                             -geoid ${INPUTDATA}/DEM/egm96.grd
+                             -elev.dem.geoid ${INPUTDATA}/DEM/egm96.grd
                              -rgs 2.0
                              -sgs 2.0
                      VALID   --compare-image ${EPSILON_10}