Minor validation tweaks