Correction of severals bugs.