Some errors fixed