Fix form errors with new class.