Fixed deprecated forms.