More fixes to the household matching.