Updated a few areas to use more modern form validation calls.