Correct the errors (18/48)

Correct the errors