I think after this, the type errors should go away