diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12ecacaae67de08edba74ce4e58a6ecd3484f8d7..59932b16b727c24e191c92955f02e2d2aad23a84 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -939,7 +939,7 @@ if( CHAMELEON_SCHED_OPENMP )
         list(APPEND OPENMP_COMPONENT_LIST "CUDA")
     endif()
 
-    find_package(${OPENMP_COMPONENT_LIST})
+    find_package(OpenMP COMPONENTS ${OPENMP_COMPONENT_LIST})
 
     # Add definition and include_dir if found
     # TODO
@@ -950,8 +950,8 @@ if( CHAMELEON_SCHED_OPENMP )
             #include_directories(${STARPU_INCLUDE_DIRS_DEP})
             #set(CMAKE_REQUIRED_INCLUDES "${STARPU_INCLUDE_DIRS_DEP}")
         #endif()
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fopenmp")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_CXX_FLAGS}")
         #if(STARPU_LDFLAGS_OTHER_DEP)
             #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${STARPU_LDFLAGS_OTHER_DEP}")
             #set(CMAKE_REQUIRED_LDFLAGS "${STARPU_LDFLAGS_OTHER_DEP}")
@@ -995,6 +995,7 @@ if( CHAMELEON_SCHED_OPENMP )
             #message("-- ${Blue}CHAMELEON_USE_MIGRATE is turned OFF because starpu_mpi_data_migrate not found${ColourReset}")
         #endif()
     else ( OPENMP_FOUND )
+      message(FATAL_ERROR "Something went wrong when finding OpenMP")
         #if(MORSE_VERBOSE_FIND_PACKAGE)
             #if(NOT HWLOC_FOUND OR NOT HWLOC_LIBRARIES)
                 #if (NOT HWLOC_hwloc.h_DIRS)
diff --git a/timing/timing.c b/timing/timing.c
index 274c486a04b06c728253f3977eef3a4582e036c5..ff268c7192292b51db2fc348457833cb7ddb8823 100644
--- a/timing/timing.c
+++ b/timing/timing.c
@@ -147,7 +147,7 @@ Test(int64_t n, int *iparam) {
     }
 
     if ( CHAMELEON_My_Mpi_Rank() == 0)
-        printf( "%7d %7d %7d ", iparam[IPARAM_M], iparam[IPARAM_N], iparam[IPARAM_K] );
+        printf( "%10d %7d %7d %7d %7d ", iparam[IPARAM_THRDNBR], iparam[IPARAM_M], iparam[IPARAM_N], iparam[IPARAM_NB], iparam[IPARAM_K] );
     fflush( stdout );
 
     // FIXME: use posix_memalign, or hwloc allocation with first touch, to avoid
@@ -430,7 +430,7 @@ print_header(char *prog_name, int * iparam) {
             iparam[IPARAM_IB],
             eps );
 
-    printf( "#     M       N  K/NRHS   seconds   Gflop/s Deviation%s%s\n",
+    printf( "#  Threads       M       N      BS  K/NRHS   seconds   Gflop/s Deviation%s%s\n",
             bound_header, iparam[IPARAM_INVERSE] ? inverse_header : check_header);
     return;
 }