Correct tidy failures