Correcting some tough errors.