More Unifier fixes