Various fields now have better input validation