Some errors are correcte