More validation tweaks.