Further validation improvements