Bugfixes, unification and critical pairs