3.0 validation fixes

Fixes #3873
Cool. I should have known there would be existing tests for the case I asked about.