Equality fixes