Further validation tweaks