Some errors removed