Validation tweaks.