More fixes relating to record  table merge
I don't even know