Some errors correction