A couple adjustments for form submission