diff --git a/CMakeLists.txt b/CMakeLists.txt
index 850d710b18d9174f9ca5f4b80cee31fc62416879..fb456857f0678e1e53a1d491592a740f0d69c01d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -265,10 +265,10 @@ IF(OTB_USE_VISU_GUI)
         FIND_PACKAGE(OpenGL)
 
         IF( NOT OPENGL_FOUND )
-                MESSAGE(FATAL_ERROR "Impossible to find OpenGL on your system.\nCannot build OTB Visu module without OpenGL library.\nInstall OpenGL on your system OR set OTB_USE_VISU to OFF to disable OTB Visu module generation !")
-	ENDIF( NOT OPENGL_FOUND )
+                MESSAGE(FATAL_ERROR "Impossible to find OpenGL on your system.\nCannot build OTB Visu module without OpenGL library.\nInstall OpenGL on your system OR set OTB_USE_VISU_GUI to OFF to disable OTB Visu module generation !")
+	    ENDIF( NOT OPENGL_FOUND )
         IF( NOT OPENGL_GLU_FOUND )
-                MESSAGE(FATAL_ERROR "Impossible to find GLU library on your system.\nCannot build OTB Visu module without GLU library.\nInstall GLU library on your system OR set OTB_USE_VISU to OFF to disable OTB Visu module generation !")
+                MESSAGE(FATAL_ERROR "Impossible to find GLU library on your system.\nCannot build OTB Visu module without GLU library.\nInstall GLU library on your system OR set OTB_USE_VISU_GUI to OFF to disable OTB Visu module generation !")
         ENDIF( NOT OPENGL_GLU_FOUND )
 
         IF(OPENGL_INCLUDE_DIR)
@@ -290,11 +290,11 @@ IF(OTB_USE_VISU_GUI)
         FIND_PACKAGE(FLTK)
 
 	# If an external fltk is found, do not provide the internal fltk choice
-	IF(NOT FLTK_FOUND)
-          OPTION(OTB_USE_EXTERNAL_FLTK "Use an outside build of FLTK." OFF)
-	ELSE(NOT FLTK_FOUND)
-	  SET(OTB_USE_EXTERNAL_FLTK ON)
-	ENDIF(NOT FLTK_FOUND)
+	IF(FLTK_FOUND)
+       OPTION(OTB_USE_EXTERNAL_FLTK "Use an outside build of FLTK." ON)
+	ELSE(FLTK_FOUND)
+	   OPTION(OTB_USE_EXTERNAL_FLTK "Use an outside build of FLTK." OFF)
+	ENDIF(FLTK_FOUND)
                          
 #        IF(FLTK_FOUND)
 #           SET(OTB_USE_EXTERNAL_FLTK ON)
diff --git a/Examples/BasicFilters/HillShadingExample.cxx b/Examples/BasicFilters/HillShadingExample.cxx
index 3a706fc0769d2894f859f3608a9e6f4af896dc97..a4be0ad195fab9dc1c36fb852e3a29913c1cce8f 100644
--- a/Examples/BasicFilters/HillShadingExample.cxx
+++ b/Examples/BasicFilters/HillShadingExample.cxx
@@ -154,7 +154,7 @@ int main(int argc, char * argv[])
   //
   // After generating the dem image as in the DEMToImageGenerator example, you can declare
   // the hill shading mechanism. The hill shading is implemented as a functor doing some
-  // operations in its neighorhood. This functor is used in the
+  // operations in its neighborhood. This functor is used in the
   // \doxygen{otb}{UnaryFunctorNeighborhoodImageFilter} that will be in charge of processing
   // the whole image.
   //