diff --git a/.gitlab/build.sh b/.gitlab/build.sh
index 492fc6d31bb2a2b20d113d55e35ddc729fee6796..50f559d620427273883038e01186f0244ae6041e 100755
--- a/.gitlab/build.sh
+++ b/.gitlab/build.sh
@@ -13,7 +13,9 @@
 ###
 set -ex
 
+# To be removed when OTF2 will be "correctly" installed in the Docker image
 PATH=$PATH:$OTF2_DIR/bin
+
 #
 # Build the project
 #
diff --git a/cmake/FindOTF2.cmake b/cmake/FindOTF2.cmake
index 8089bf8097305bc4df698ccc39816a25c7c00676..d90a452e256d0d23f7d9ddd08ea4e579fbef41ce 100644
--- a/cmake/FindOTF2.cmake
+++ b/cmake/FindOTF2.cmake
@@ -2,8 +2,8 @@
 # Find the OTF2 library
 #
 # OTF2_INCLUDE_DIR  - Directories to include to use OTF2
-# OTF2_LIBRARY_PATH  - Files to link against to use OTF2
-# OTF2_CONFIG        - Path to otf2-config
+# OTF2_LIBRARY_PATH - Files to link against to use OTF2
+# OTF2_CONFIG       - Path to otf2-config
 
 
 find_program(OTF2_CONFIG otf2-config REQUIRED)
@@ -18,7 +18,7 @@ ELSE()
   execute_process(COMMAND ${OTF2_CONFIG} "--cppflags" OUTPUT_VARIABLE OTF2_INCLUDE_DIR)
   STRING(REPLACE "\n" "" OTF2_INCLUDE_DIR ${OTF2_INCLUDE_DIR})
   STRING(REPLACE "-I" "" OTF2_INCLUDE_DIR ${OTF2_INCLUDE_DIR})
-  
+
   execute_process(COMMAND ${OTF2_CONFIG} "--ldflags" OUTPUT_VARIABLE _LINK_LD_ARGS)
   STRING( REPLACE " " ";" _LINK_LD_ARGS ${_LINK_LD_ARGS} )
   FOREACH( _ARG ${_LINK_LD_ARGS} )