2 fixes needed to gathering equalities