one final round of data consistency errors

Ugh.