Fix associate tables