unification fixes