Validation tweaks