Update Unify
Unify fixes
Desugar with type errors