Some errors fix