All errors fixed