correcting some defects