minor validation tweaks