Some fixed errors