Fix new form compat errors