diff --git a/Documentation/SoftwareGuide/Latex/Installation.tex b/Documentation/SoftwareGuide/Latex/Installation.tex
index 4d3e8088b48e118c06b1f8d08927bc71332e9c2a..d012a996bb4d1533e07dc14a120d5e41318a6450 100644
--- a/Documentation/SoftwareGuide/Latex/Installation.tex
+++ b/Documentation/SoftwareGuide/Latex/Installation.tex
@@ -227,8 +227,8 @@ In fact there is no make install target for the SuperBuild.
 By default, SuperBuild will not use any of libraries installed on system. All \texttt{USE\_SYSTEM\_\textit{XXX}} are
 are set to FALSE. This is our recommended way of using SuperBuild. You are however free to use a system library
 if you want!. You must be very much aware of dependencies of those libraries you use from system. For example,
-if libjpeg is not used from superbuild using USE_SYSTEM_JPEG=TRUE then you should not use zlib from superbuild
-because zlib is a dependency of libjpeg. Here SuperBuild will not automagically set USE_SYSTEM_ZLIB=FALSE.
+if libjpeg is not used from superbuild using \texttt{USE\_SYSTEM\_JPEG=TRUE} then you should not use zlib from superbuild
+because zlib is a dependency of libjpeg. Here SuperBuild will not automagically set \texttt{USE\_SYSTEM\_ZLIB=FALSE}.
 You must do it yourself. The example of libjpeg - zlib dependency chain is so simple.
 Imagine the same case for GDAL which depends on zlib, libjpeg, libtiff(with big tiff support), geotiff,
 sqlite, curl, geos, libkml, openjpeg. This is one of the reasons we recommend to use SuperBuild exclusively or not.
diff --git a/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx b/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
index a9718e05a20d58aacd9197e918bf456c2108dc72..98a1837d0a4fb3a7ee2cf259571df4fdebc13baf 100644
--- a/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
+++ b/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
@@ -52,7 +52,7 @@
 // \item allow the computation of the radiative terms by other libraries
 // than 6S (such as SMAC method).
 // \item allow the users of the OpticalCalibration application to set
-// and ITK_OVERRIDE each correction parameter.
+// and override each correction parameter.
 // \end{itemize}
 //
 // Let's look at the minimal code required to use this
diff --git a/Modules/Applications/AppClassification/test/CMakeLists.txt b/Modules/Applications/AppClassification/test/CMakeLists.txt
index d517ff822deeca638a8c2d31d591bc2c38c5b6e3..3d804e38aff893b539c937ca72f401a224033f51 100644
--- a/Modules/Applications/AppClassification/test/CMakeLists.txt
+++ b/Modules/Applications/AppClassification/test/CMakeLists.txt
@@ -882,14 +882,16 @@ otb_test_application(NAME apTvClSampleExtraction
                              ${TEMP}/apTvClSampleExtractionOut.sqlite)
 
 #----------- TrainVectorClassifier TESTS ----------------
-otb_test_application(NAME apTvClTrainVectorClassifier
-                     APP  TrainVectorClassifier
-                     OPTIONS -io.vd ${INPUTDATA}/Classification/apTvClSampleExtractionOut.sqlite
-                             -feat value_0 value_1 value_2 value_3
-                             -cfield class
-                             -classifier rf
-                             -io.confmatout ${TEMP}/apTvClTrainVectorClassifierConfMat.txt
-                             -io.out ${TEMP}/apTvClTrainVectorClassifierModel.rf
-                     VALID   --compare-ascii ${NOTOL}
-                             ${OTBAPP_BASELINE_FILES}/apTvClTrainVectorClassifierModel.rf
-                             ${TEMP}/apTvClTrainVectorClassifierModel.rf)
+if(OTB_USE_OPENCV)
+  otb_test_application(NAME apTvClTrainVectorClassifier
+    APP  TrainVectorClassifier
+    OPTIONS -io.vd ${INPUTDATA}/Classification/apTvClSampleExtractionOut.sqlite
+    -feat value_0 value_1 value_2 value_3
+    -cfield class
+    -classifier rf
+    -io.confmatout ${TEMP}/apTvClTrainVectorClassifierConfMat.txt
+    -io.out ${TEMP}/apTvClTrainVectorClassifierModel.rf
+    VALID   --compare-ascii ${NOTOL}
+    ${OTBAPP_BASELINE_FILES}/apTvClTrainVectorClassifierModel.rf
+    ${TEMP}/apTvClTrainVectorClassifierModel.rf)
+endif()
\ No newline at end of file