Some unification fixes