Fixes to form validation and reset