Changes to tweak forms to better handle error messages.