Second round of validation error cleanup