Made a few more small data validation changes to some forms