Few more fixes for forms.