diff --git a/maca_trans_parser/src/feat_fct.c b/maca_trans_parser/src/feat_fct.c
index b0565505ea9ab0b69ef430114ecb95819d0e92f2..45f430b833e133f416156348a5b220d60ff1a02e 100644
--- a/maca_trans_parser/src/feat_fct.c
+++ b/maca_trans_parser/src/feat_fct.c
@@ -178,8 +178,8 @@ int b0sf(void *c) {return word_get_label(word_buffer_b0(config_get_buffer((confi
 int b0len(void *c) {
   int len = 0;
   word *w = word_buffer_b0(config_get_buffer((config *) c));
-  if(w->input)
-    len = strlen(w->input);
+  if(w->form)
+    len = strlen(w->form);
   return (len > 7)? 7 : len;
 }
 
diff --git a/maca_trans_parser/src/movements.c b/maca_trans_parser/src/movements.c
index 8622e4a62b5874ac136237daef6859b80bba25c1..1107e7910260cd07e012d013fb079ab608340fbd 100644
--- a/maca_trans_parser/src/movements.c
+++ b/maca_trans_parser/src/movements.c
@@ -158,7 +158,7 @@ int movement_root(config *c, int movement_code, int root_code)
   s0->is_root = 1;
 
   /*---- ajout 19/12/17 ----------*/
-  word_set_sent_seg(word_buffer_get_word_n(config_get_buffer(c), s0->rspan), 1); 
+  //   word_set_sent_seg(word_buffer_get_word_n(config_get_buffer(c), s0->rspan), 1); 
   /*-----------------------------*/
   stack_pop(config_get_stack(c));
 
diff --git a/maca_trans_parser/src/oracle_parser_arc_eager.c b/maca_trans_parser/src/oracle_parser_arc_eager.c
index e258c93d632757a4346f3b7c6c3b9e6a009f8ceb..209e636485ff382f83cc9329f672e97ea6a210ee 100644
--- a/maca_trans_parser/src/oracle_parser_arc_eager.c
+++ b/maca_trans_parser/src/oracle_parser_arc_eager.c
@@ -68,10 +68,10 @@ int oracle_parser_arc_eager(config *c, word_buffer *ref, int root_label)
     }
 
     /* word on the top of the stack is an end of sentence marker */
-    /*      if((word_get_sent_seg(word_buffer_get_word_n(ref, s0_index)) == 1)
+   if((word_get_sent_seg(word_buffer_get_word_n(ref, s0_index)) == 1)
        && (word_get_sent_seg(word_buffer_get_word_n(config_get_buffer(c), s0_index)) != 1)){
       return MVT_PARSER_EOS;
-      }*/
+      }
 
     /* LEFT ARC  b0 is the governor and s0 the dependent */
     if(s0_gov_index == b0_index){