3.0 validation fixes

Fixes #3873
Yes, the rest of the tests still pass