diff --git a/Code/IO/CMakeLists.txt b/Code/IO/CMakeLists.txt
index 876326d9ba1326e87ad025fd30c6f8db54de6aee..db0c68c9f84515f0dbcd5308475d29b5e15c34d8 100644
--- a/Code/IO/CMakeLists.txt
+++ b/Code/IO/CMakeLists.txt
@@ -30,7 +30,7 @@ ENDIF(OTB_COMPILE_JPEG2000)
 
 
 ADD_LIBRARY(OTBIO ${OTBIO_SRCS})
-TARGET_LINK_LIBRARIES (OTBIO ${GDAL_LIBRARY} ${OGR_LIBRARY} OTBCommon)
+TARGET_LINK_LIBRARIES (OTBIO ${GDAL_LIBRARY} ${OGR_LIBRARY} ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} ${JPEG_LIBRARY} OTBCommon)
 TARGET_LINK_LIBRARIES (OTBIO otbossim otbossimplugins ITKIO ITKCommon dxf otbkml)
 
 IF (OTB_USE_LIBLAS)
@@ -70,10 +70,10 @@ IF(NOT OTB_COMPILE_JPEG2000)
 ENDIF(NOT OTB_COMPILE_JPEG2000)
 
 # Compile otbTestDriver
-# Nedded in the OTB-Wrapping project.
+# Needed in the OTB-Wrapping project.
 # Has to be compiled even if the BUILD_TEST  are set to OFF
 IF(CMAKE_COMPILER_IS_GNUCXX)
-  SET_SOURCE_FILES_PROPERTIES(itkTestDriver.cxx PROPERTIES COMPILE_FLAGS -w)
+  SET_SOURCE_FILES_PROPERTIES(otbTestDriver.cxx PROPERTIES COMPILE_FLAGS -w)
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 ADD_EXECUTABLE(otbTestDriver otbTestDriver.cxx) 
diff --git a/Testing/Code/BasicFilters/otbBasicFiltersTests1.cxx b/Testing/Code/BasicFilters/otbBasicFiltersTests1.cxx
index a771c78e31a4d9f5297a94f2b99e660f59162e41..b264f1d11cb56e85fd752e0a7de9ee8595e42ebd 100644
--- a/Testing/Code/BasicFilters/otbBasicFiltersTests1.cxx
+++ b/Testing/Code/BasicFilters/otbBasicFiltersTests1.cxx
@@ -29,7 +29,6 @@ void RegisterTests()
 {
   REGISTER_TEST(otbLeeFilter);
   REGISTER_TEST(otbFrostFilterNew);
-  // REGISTER_TEST(otbFrostFilterTest);
   REGISTER_TEST(otbFrostFilter);
   REGISTER_TEST(otbImageToPointSetFilterTest);
   REGISTER_TEST(otbOpeningClosingMorphologicalFilterNew);
diff --git a/Utilities/dxflib/CMakeLists.txt b/Utilities/dxflib/CMakeLists.txt
index e4df2ad34b7f2c9fa8d2e6ee7fa02057b0fdac9e..867243ef4ac995141157ebfa6dda69feb8464a08 100644
--- a/Utilities/dxflib/CMakeLists.txt
+++ b/Utilities/dxflib/CMakeLists.txt
@@ -2,7 +2,7 @@ PROJECT(dxflib)
 
 FILE(GLOB dxflib_SRCS "*.cpp")
 ADD_LIBRARY(dxf ${dxflib_SRCS})
-TARGET_LINK_LIBRARIES(dxf)
+
 IF(OTB_LIBRARY_PROPERTIES)
   SET_TARGET_PROPERTIES(dxf PROPERTIES ${OTB_LIBRARY_PROPERTIES})
 ENDIF(OTB_LIBRARY_PROPERTIES)
diff --git a/Utilities/otbconfigfile/CMakeLists.txt b/Utilities/otbconfigfile/CMakeLists.txt
index dd622f9749c55741eda9b899a5766712e675d2bf..245153a5e402a6c3524bcccd4e6eb6eea1be8f57 100644
--- a/Utilities/otbconfigfile/CMakeLists.txt
+++ b/Utilities/otbconfigfile/CMakeLists.txt
@@ -5,7 +5,6 @@ FILE(GLOB otbconfigfilelib_HDRS "ConfigFile.h")
 
 ADD_LIBRARY(otbconfigfile ${otbconfigfilelib_SRCS} )
 
-TARGET_LINK_LIBRARIES(otbconfigfile )
 IF(OTB_LIBRARY_PROPERTIES)
   SET_TARGET_PROPERTIES(otbconfigfile PROPERTIES ${OTB_LIBRARY_PROPERTIES})
 ENDIF(OTB_LIBRARY_PROPERTIES)
diff --git a/Utilities/otbossim/CMakeLists.txt b/Utilities/otbossim/CMakeLists.txt
index 4764d625f5bb91b6cdff97c54cdeb66fea88df7a..b4dd3dbd94c4bceb8f44ae6f1de9b968b86c195a 100644
--- a/Utilities/otbossim/CMakeLists.txt
+++ b/Utilities/otbossim/CMakeLists.txt
@@ -140,8 +140,9 @@ IF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
   ${ossim_imaging_SRCS}
   ${ossim_parallel_SRCS}
   ${ossim_elevation_SRCS}
-  )
-  TARGET_LINK_LIBRARIES(otbossim ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} ${JPEG_LIBRARY} ${OPENTHREADS_LIBRARY})
+  
+#  TARGET_LINK_LIBRARIES(otbossim ${GDAL_LIBRARY})#To make sure that gdal appear before geotiff
+#  TARGET_LINK_LIBRARIES(otbossim ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} ${JPEG_LIBRARY} ${OPENTHREADS_LIBRARY})
 
   IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS otbossim
diff --git a/Utilities/otbossimplugins/CMakeLists.txt b/Utilities/otbossimplugins/CMakeLists.txt
index 87dac26d4fd7173900b2b1970b54622e01bb857e..b2e4ac195b3a8719b7707a764a346ef726153f54 100644
--- a/Utilities/otbossimplugins/CMakeLists.txt
+++ b/Utilities/otbossimplugins/CMakeLists.txt
@@ -23,9 +23,8 @@ SET(ossimplugins_SOURCES
   ${ossimplugins_ossim_SRCS}
 )
 
-
 ADD_LIBRARY(otbossimplugins ${ossimplugins_SOURCES} )
-TARGET_LINK_LIBRARIES(otbossimplugins ${GDAL_LIBRARY} otbossim)
+#TARGET_LINK_LIBRARIES(otbossimplugins ${GDAL_LIBRARY} otbossim)
 IF(OTB_LIBRARY_PROPERTIES)
   SET_TARGET_PROPERTIES(otbossimplugins PROPERTIES ${OTB_LIBRARY_PROPERTIES})
 ENDIF(OTB_LIBRARY_PROPERTIES)