3.0 validation fixes

Fixes #3873