Some others changes