diff --git a/include/morse_simulate.h b/include/morse_simulate.h
index 03dd4fb401300d67ea0ad7782ba187dda5a2d1b0..7ef57e7291d309fe45b267cdb33f3937dffd3224 100644
--- a/include/morse_simulate.h
+++ b/include/morse_simulate.h
@@ -3,7 +3,7 @@
  * @copyright (c) 2009-2014 The University of Tennessee and The University
  *                          of Tennessee Research Foundation.
  *                          All rights reserved.
- * @copyright (c) 2012-2015 Inria. All rights reserved.
+ * @copyright (c) 2012-2017 Inria. All rights reserved.
  * @copyright (c) 2012-2014 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
  *
  **/
@@ -25,7 +25,7 @@
 #ifndef _MORSE_SIMULATE_H_
 #define _MORSE_SIMULATE_H_
 
-#include "include/chameleon_config.h"
+#include "chameleon_config.h"
 
 /* we need this when starpu is compiled with simgrid enabled */
 #if defined(CHAMELEON_SCHED_STARPU) && defined(CHAMELEON_SIMULATION)
diff --git a/include/morse_struct.h b/include/morse_struct.h
index a710366df4db13e608749f19a999f1f49fd3e9bf..522dd61fe9c02fca04e95a824e4ed8d90a5929e8 100644
--- a/include/morse_struct.h
+++ b/include/morse_struct.h
@@ -3,7 +3,7 @@
  * @copyright (c) 2009-2014 The University of Tennessee and The University
  *                          of Tennessee Research Foundation.
  *                          All rights reserved.
- * @copyright (c) 2012-2014 Inria. All rights reserved.
+ * @copyright (c) 2012-2017 Inria. All rights reserved.
  * @copyright (c) 2012-2014 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
  *
  **/
@@ -28,7 +28,7 @@
 #ifndef _MORSE_STRUCT_H_
 #define _MORSE_STRUCT_H_
 
-#include "include/chameleon_config.h"
+#include "chameleon_config.h"
 #include "morse_types.h"
 
 /** ****************************************************************************
@@ -81,7 +81,7 @@ struct morse_desc_s {
     int mb;           // number of rows in a tile
     int nb;           // number of columns in a tile
     int bsiz;         // size in elements including padding
-    int lm;           // number of rows of the entire matrix
+    int lm;  	      // number of rows of the entire matrix
     int ln;           // number of columns of the entire matrix
     int lmt;          // number of tile rows of the entire matrix - derived parameter
     int lnt;          // number of tile columns of the entire matrix - derived parameter
diff --git a/runtime/starpu/codelets/codelet_zbuild.c b/runtime/starpu/codelets/codelet_zbuild.c
index de3b1650bb2b8fcb1a0f7d27636fb90e73f0b523..d2e654064a626977bb7bada6ec775e972601c2e4 100644
--- a/runtime/starpu/codelets/codelet_zbuild.c
+++ b/runtime/starpu/codelets/codelet_zbuild.c
@@ -84,7 +84,7 @@ static void cl_zbuild_cpu_func(void *descr[], void *cl_arg)
 
   /* The callback 'user_build_callback' is expected to build the block of matrix [row_min, row_max] x [col_min, col_max]
    * (with both min and max values included in the intervals, index start at 0 like in C, NOT 1 like in Fortran)
-   * and store it at the adresse 'buffer' with leading dimension 'ld'
+   * and store it at the address 'buffer' with leading dimension 'ld'
    */
   user_build_callback(row_min, row_max, col_min, col_max, A, ld, user_data);