More validation tweaks