Builder equality fixes