Errors fixed