validation tweaks