Further fixes and tweaks for form validation errors