Minor tweaks for isValid handling