Fixes some more import errors in forms.