Cleaning up a number of errors.