small tweaks during validation