Fixes for form validation and sending