Minor data validation tweaks