Correct tidy errors.