More fixes for dynamic forms.